ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.69 by root, Tue Apr 17 18:24:29 2007 UTC vs.
Revision 1.72 by root, Sat Apr 21 12:28:31 2007 UTC

… …
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 419 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 420 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 421 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 422 { "boat" , MOVE_BOAT },
423 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 424 { "all" , MOVE_ALL },
424 }; 425 };
425 426
426 if (!str) 427 if (!str)
427 { 428 {
… …
473 CLEAR_FLAG (op, flag) \ 474 CLEAR_FLAG (op, flag) \
474 475
475bool 476bool
476object::parse_kv (object_thawer &f) 477object::parse_kv (object_thawer &f)
477{ 478{
478 assert (f.kw == KW_object || f.kw == KW_arch);
479
480 if (f.kw == KW_object)
481 f.get (name); // preset name from object name
482
483 f.next ();
484
485 object *op_inv = inv; 479 object *op_inv = inv;
486 480
487 for (;;) 481 for (;;)
488 { 482 {
489 switch (f.kw) 483 switch (f.kw)
… …
990 arch = archetype::find ("earthwall"); 984 arch = archetype::find ("earthwall");
991 } 985 }
992 986
993 assert (arch); //D maybe use exception handling of sorts? 987 assert (arch); //D maybe use exception handling of sorts?
994 988
989 f.next ();
990
995 object *op = object::create (); 991 object *op = object::create ();
996 992
997 op->map = map; 993 op->map = map;
998 arch->clone.copy_to (op); 994 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly 995 // copy_to activates, this should be fixed properly
… …
1017int 1013int
1018set_variable (object *op, char *buf) 1014set_variable (object *op, char *buf)
1019{ 1015{
1020 object_thawer f (buf, (AV *)0); 1016 object_thawer f (buf, (AV *)0);
1021 1017
1022 f.kw = KW_arch; // special hack so that parse_kv skips 1018 f.next ();
1023 return op->parse_kv (f); 1019 return op->parse_kv (f);
1024} 1020}
1025 1021
1026/* This returns a string of the integer movement type */ 1022/* This returns a string of the integer movement type */
1027#if 0 1023#if 0
… …
1400} 1396}
1401 1397
1402///////////////////////////////////////////////////////////////////////////// 1398/////////////////////////////////////////////////////////////////////////////
1403 1399
1404// generic resource file load, 1400// generic resource file load,
1405// currently supports: region, treasures 1401// currently supports: region, treasures, archetypes
1406bool load_resource_file (const char *filename) 1402bool load_resource_file (const char *filename)
1407{ 1403{
1408 object_thawer f (filename); 1404 object_thawer f (filename);
1405
1406 bool success = false;
1407 bool seen_arch = false;
1409 1408
1410 f.next (); 1409 f.next ();
1411 1410
1412 for (;;) 1411 for (;;)
1413 { 1412 {
1414 switch (f.kw) 1413 switch (f.kw)
1415 { 1414 {
1416 case KW_region: 1415 case KW_region:
1417 if (!region::read (f)) 1416 if (!region::read (f))
1418 return false; 1417 goto finish;
1419 break; 1418 break;
1420 1419
1421 case KW_treasure: 1420 case KW_treasure:
1422 case KW_treasureone: 1421 case KW_treasureone:
1423 if (!treasurelist::read (f)) 1422 if (!treasurelist::read (f))
1424 return false; 1423 goto finish;
1424 break;
1425
1426 case KW_object:
1427 seen_arch = true;
1428 if (!archetype::read (f))
1429 goto finish;
1425 break; 1430 break;
1426 1431
1427 case KW_EOF: 1432 case KW_EOF:
1428 return true; 1433 success = true;
1434 goto finish;
1429 1435
1430 default: 1436 default:
1431 if (!f.parse_error ("resource file")) 1437 if (!f.parse_error ("resource file"))
1432 return false; 1438 goto finish;
1433 } 1439 }
1434 } 1440 }
1441
1442finish:
1443 if (seen_arch)
1444 init_archetype_pointers ();
1445
1446 return success;
1435} 1447}
1436 1448

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines