--- deliantra/server/common/loader.C 2007/04/17 18:59:05 1.71 +++ deliantra/server/common/loader.C 2007/05/05 04:40:40 1.75 @@ -1,5 +1,5 @@ /* - * CrossFire, A Multiplayer game for X-windows + * CrossFire, A Multiplayer game * * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team * Copyright (C) 2002 Mark Wedel & Crossfire Development Team @@ -420,6 +420,7 @@ { "fly_high", MOVE_FLY_HIGH }, { "swim" , MOVE_SWIM }, { "boat" , MOVE_BOAT }, + { "ship" , MOVE_SHIP }, { "all" , MOVE_ALL }, }; @@ -834,6 +835,8 @@ case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; + case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; + case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; @@ -919,6 +922,8 @@ if (!randomitems) LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); } + else + randomitems = 0; break; case KW_msg: @@ -1105,7 +1110,7 @@ KW_generator, KW_is_thrown, KW_auto_apply, - KW_NULL, // was KW_treasure + KW_treasure_env, KW_player_sold, /* 20 */ KW_see_invisible, @@ -1176,7 +1181,7 @@ /* 80 */ KW_has_ready_scroll, KW_can_use_rod, - KW_NULL, + KW_precious, KW_can_use_horn, KW_make_invisible, KW_inv_locked, @@ -1435,6 +1440,9 @@ default: if (!f.parse_error ("resource file")) goto finish; + + f.next (); + break; } }