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.70 by root, Tue Apr 17 18:40:31 2007 UTC vs.
Revision 1.75 by root, Sat May 5 04:40:40 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
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;
… …
924 : treasurelist::find (f.get_str ()); 920 : treasurelist::find (f.get_str ());
925 921
926 if (!randomitems) 922 if (!randomitems)
927 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 923 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
928 } 924 }
925 else
926 randomitems = 0;
929 break; 927 break;
930 928
931 case KW_msg: 929 case KW_msg:
932 f.get_ml (KW_endmsg, msg); 930 f.get_ml (KW_endmsg, msg);
933 //TODO: allow longer messages 931 //TODO: allow longer messages
… …
989 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 987 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
990 arch = archetype::find ("earthwall"); 988 arch = archetype::find ("earthwall");
991 } 989 }
992 990
993 assert (arch); //D maybe use exception handling of sorts? 991 assert (arch); //D maybe use exception handling of sorts?
992
993 f.next ();
994 994
995 object *op = object::create (); 995 object *op = object::create ();
996 996
997 op->map = map; 997 op->map = map;
998 arch->clone.copy_to (op); 998 arch->clone.copy_to (op);
… …
1017int 1017int
1018set_variable (object *op, char *buf) 1018set_variable (object *op, char *buf)
1019{ 1019{
1020 object_thawer f (buf, (AV *)0); 1020 object_thawer f (buf, (AV *)0);
1021 1021
1022 f.kw = KW_arch; // special hack so that parse_kv skips 1022 f.next ();
1023 return op->parse_kv (f); 1023 return op->parse_kv (f);
1024} 1024}
1025 1025
1026/* This returns a string of the integer movement type */ 1026/* This returns a string of the integer movement type */
1027#if 0 1027#if 0
… …
1108 KW_monster, 1108 KW_monster,
1109 KW_friendly, 1109 KW_friendly,
1110 KW_generator, 1110 KW_generator,
1111 KW_is_thrown, 1111 KW_is_thrown,
1112 KW_auto_apply, 1112 KW_auto_apply,
1113 KW_NULL, // was KW_treasure 1113 KW_treasure_env,
1114 KW_player_sold, 1114 KW_player_sold,
1115 /* 20 */ 1115 /* 20 */
1116 KW_see_invisible, 1116 KW_see_invisible,
1117 KW_can_roll, 1117 KW_can_roll,
1118 KW_overlay_floor, 1118 KW_overlay_floor,
… …
1179 KW_can_use_skill, 1179 KW_can_use_skill,
1180 KW_been_applied, 1180 KW_been_applied,
1181 /* 80 */ 1181 /* 80 */
1182 KW_has_ready_scroll, 1182 KW_has_ready_scroll,
1183 KW_can_use_rod, 1183 KW_can_use_rod,
1184 KW_NULL, 1184 KW_precious,
1185 KW_can_use_horn, 1185 KW_can_use_horn,
1186 KW_make_invisible, 1186 KW_make_invisible,
1187 KW_inv_locked, 1187 KW_inv_locked,
1188 KW_is_wooded, 1188 KW_is_wooded,
1189 KW_is_hilly, 1189 KW_is_hilly,
… …
1438 goto finish; 1438 goto finish;
1439 1439
1440 default: 1440 default:
1441 if (!f.parse_error ("resource file")) 1441 if (!f.parse_error ("resource file"))
1442 goto finish; 1442 goto finish;
1443
1444 f.next ();
1445 break;
1443 } 1446 }
1444 } 1447 }
1445 1448
1446finish: 1449finish:
1447 if (seen_arch) 1450 if (seen_arch)

Diff Legend

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