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.73 by root, Sat Apr 28 17:51:57 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)
… …
839 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
840 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
841 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
842 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
843 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 837 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
838 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
839 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
844 840
845 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 841 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
846 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 842 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
847 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 843 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
848 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 844 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
990 arch = archetype::find ("earthwall"); 986 arch = archetype::find ("earthwall");
991 } 987 }
992 988
993 assert (arch); //D maybe use exception handling of sorts? 989 assert (arch); //D maybe use exception handling of sorts?
994 990
991 f.next ();
992
995 object *op = object::create (); 993 object *op = object::create ();
996 994
997 op->map = map; 995 op->map = map;
998 arch->clone.copy_to (op); 996 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly 997 // copy_to activates, this should be fixed properly
… …
1017int 1015int
1018set_variable (object *op, char *buf) 1016set_variable (object *op, char *buf)
1019{ 1017{
1020 object_thawer f (buf, (AV *)0); 1018 object_thawer f (buf, (AV *)0);
1021 1019
1022 f.kw = KW_arch; // special hack so that parse_kv skips 1020 f.next ();
1023 return op->parse_kv (f); 1021 return op->parse_kv (f);
1024} 1022}
1025 1023
1026/* This returns a string of the integer movement type */ 1024/* This returns a string of the integer movement type */
1027#if 0 1025#if 0
… …
1108 KW_monster, 1106 KW_monster,
1109 KW_friendly, 1107 KW_friendly,
1110 KW_generator, 1108 KW_generator,
1111 KW_is_thrown, 1109 KW_is_thrown,
1112 KW_auto_apply, 1110 KW_auto_apply,
1113 KW_NULL, // was KW_treasure 1111 KW_treasure_env,
1114 KW_player_sold, 1112 KW_player_sold,
1115 /* 20 */ 1113 /* 20 */
1116 KW_see_invisible, 1114 KW_see_invisible,
1117 KW_can_roll, 1115 KW_can_roll,
1118 KW_overlay_floor, 1116 KW_overlay_floor,
… …
1179 KW_can_use_skill, 1177 KW_can_use_skill,
1180 KW_been_applied, 1178 KW_been_applied,
1181 /* 80 */ 1179 /* 80 */
1182 KW_has_ready_scroll, 1180 KW_has_ready_scroll,
1183 KW_can_use_rod, 1181 KW_can_use_rod,
1184 KW_NULL, 1182 KW_precious,
1185 KW_can_use_horn, 1183 KW_can_use_horn,
1186 KW_make_invisible, 1184 KW_make_invisible,
1187 KW_inv_locked, 1185 KW_inv_locked,
1188 KW_is_wooded, 1186 KW_is_wooded,
1189 KW_is_hilly, 1187 KW_is_hilly,
… …
1400} 1398}
1401 1399
1402///////////////////////////////////////////////////////////////////////////// 1400/////////////////////////////////////////////////////////////////////////////
1403 1401
1404// generic resource file load, 1402// generic resource file load,
1405// currently supports: region, treasures 1403// currently supports: region, treasures, archetypes
1406bool load_resource_file (const char *filename) 1404bool load_resource_file (const char *filename)
1407{ 1405{
1408 object_thawer f (filename); 1406 object_thawer f (filename);
1407
1408 bool success = false;
1409 bool seen_arch = false;
1409 1410
1410 f.next (); 1411 f.next ();
1411 1412
1412 for (;;) 1413 for (;;)
1413 { 1414 {
1414 switch (f.kw) 1415 switch (f.kw)
1415 { 1416 {
1416 case KW_region: 1417 case KW_region:
1417 if (!region::read (f)) 1418 if (!region::read (f))
1418 return false; 1419 goto finish;
1419 break; 1420 break;
1420 1421
1421 case KW_treasure: 1422 case KW_treasure:
1422 case KW_treasureone: 1423 case KW_treasureone:
1423 if (!treasurelist::read (f)) 1424 if (!treasurelist::read (f))
1424 return false; 1425 goto finish;
1426 break;
1427
1428 case KW_object:
1429 seen_arch = true;
1430 if (!archetype::read (f))
1431 goto finish;
1425 break; 1432 break;
1426 1433
1427 case KW_EOF: 1434 case KW_EOF:
1428 return true; 1435 success = true;
1436 goto finish;
1429 1437
1430 default: 1438 default:
1431 if (!f.parse_error ("resource file")) 1439 if (!f.parse_error ("resource file"))
1432 return false; 1440 goto finish;
1433 } 1441 }
1434 } 1442 }
1443
1444finish:
1445 if (seen_arch)
1446 init_archetype_pointers ();
1447
1448 return success;
1435} 1449}
1436 1450

Diff Legend

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