--- deliantra/server/common/loader.C 2006/09/14 22:33:59 1.17 +++ deliantra/server/common/loader.C 2006/09/15 00:31:36 1.18 @@ -530,30 +530,15 @@ thawer.get (op, thawer.get_sint32 ()); break; - case KW_name: - thawer.get (op->name); - break; - case KW_name_pl: - thawer.get (op->name_pl); - break; - case KW_title: - thawer.get (op->title); - break; - case KW_custom_name: - thawer.get (op->custom_name); - break; - case KW_attach: - thawer.get_ornull (op->attach); - break; - case KW_skill: - thawer.get_ornull (op->skill); - break; - case KW_race: - thawer.get_ornull (op->race); - break; - case KW_slaying: - thawer.get_ornull (op->slaying); - break; + case KW_name: thawer.get (op->name); break; + case KW_name_pl: thawer.get (op->name_pl); break; + case KW_title: thawer.get (op->title); break; + case KW_custom_name: thawer.get (op->custom_name); break; + + case KW_attach: thawer.get_ornull (op->attach); break; + case KW_skill: thawer.get_ornull (op->skill); break; + case KW_race: thawer.get_ornull (op->race); break; + case KW_slaying: thawer.get_ornull (op->slaying); break; case KW_arch: { @@ -649,21 +634,11 @@ break; - case KW_last_heal: - thawer.get (op->last_heal); - break; - case KW_last_sp: - thawer.get (op->last_sp); - break; - case KW_last_grace: - thawer.get (op->last_grace); - break; - case KW_last_eat: - thawer.get (op->last_eat); - break; - case KW_speed_left: - thawer.get (op->speed_left); - break; + case KW_last_heal: thawer.get (op->last_heal); break; + case KW_last_sp: thawer.get (op->last_sp); break; + case KW_last_grace: thawer.get (op->last_grace); break; + case KW_last_eat: thawer.get (op->last_eat); break; + case KW_speed_left: thawer.get (op->speed_left); break; case KW_speed: thawer.get (op->speed); @@ -688,151 +663,63 @@ op->face = &new_faces[FindFace (thawer.get_str (), 0)]; break; - case KW_x: - thawer.get (op->x); - break; - case KW_y: - thawer.get (op->y); - break; + case KW_x: thawer.get (op->x); break; + case KW_y: thawer.get (op->y); break; + case KW_Str: // uppercase alias - case KW_str: - thawer.get (op->stats.Str); - break; + case KW_str: thawer.get (op->stats.Str); break; case KW_Dex: // uppercase alias - case KW_dex: - thawer.get (op->stats.Dex); - break; + case KW_dex: thawer.get (op->stats.Dex); break; case KW_Con: // uppercase alias - case KW_con: - thawer.get (op->stats.Con); - break; + case KW_con: thawer.get (op->stats.Con); break; case KW_Wis: // uppercase alias - case KW_wis: - thawer.get (op->stats.Wis); - break; + case KW_wis: thawer.get (op->stats.Wis); break; case KW_Cha: // uppercase alias - case KW_cha: - thawer.get (op->stats.Cha); - break; + case KW_cha: thawer.get (op->stats.Cha); break; case KW_Int: // uppercase alias - case KW_int: - thawer.get (op->stats.Int); - break; + case KW_int: thawer.get (op->stats.Int); break; case KW_Pow: // uppercase alias - case KW_pow: - thawer.get (op->stats.Pow); - break; - case KW_hp: - thawer.get (op->stats.hp); - break; - case KW_maxhp: - thawer.get (op->stats.maxhp); - break; - case KW_sp: - thawer.get (op->stats.sp); - break; - case KW_maxsp: - thawer.get (op->stats.maxsp); - break; - case KW_grace: - thawer.get (op->stats.grace); - break; - case KW_maxgrace: - thawer.get (op->stats.maxgrace); - break; + case KW_pow: thawer.get (op->stats.Pow); break; - case KW_exp: - thawer.get (op->stats.exp); - break; - case KW_perm_exp: - thawer.get (op->perm_exp); - break; - case KW_food: - thawer.get (op->stats.food); - break; - case KW_dam: - thawer.get (op->stats.dam); - break; - case KW_wc: - thawer.get (op->stats.wc); - break; - case KW_ac: - thawer.get (op->stats.ac); - break; - case KW_nrof: - thawer.get (op->nrof); - break; - case KW_level: - thawer.get (op->level); - break; - case KW_direction: - thawer.get (op->direction); - break; - case KW_type: - thawer.get (op->type); - break; - case KW_subtype: - thawer.get (op->subtype); - break; - case KW_value: - thawer.get (op->value); - break; - case KW_weight: - thawer.get (op->weight); - break; - case KW_carrying: - thawer.get (op->carrying); - break; - case KW_attacktype: - thawer.get (op->attacktype); - break; - case KW_path_attuned: - thawer.get (op->path_attuned); - break; - case KW_path_repelled: - thawer.get (op->path_repelled); - break; - case KW_path_denied: - thawer.get (op->path_denied); - break; - case KW_invisible: - thawer.get (op->invisible); - break; - case KW_magic: - thawer.get (op->magic); - break; - case KW_state: - thawer.get (op->state); - break; - case KW_move_slow_penalty: - thawer.get (op->move_slow_penalty); - break; - case KW_material: - thawer.get (op->material); - break; - case KW_materialname: - thawer.get (op->materialname); - break; + case KW_hp: thawer.get (op->stats.hp); break; + case KW_maxhp: thawer.get (op->stats.maxhp); break; + case KW_sp: thawer.get (op->stats.sp); break; + case KW_maxsp: thawer.get (op->stats.maxsp); break; + case KW_grace: thawer.get (op->stats.grace); break; + case KW_maxgrace: thawer.get (op->stats.maxgrace); break; + + case KW_exp: thawer.get (op->stats.exp); break; + case KW_perm_exp: thawer.get (op->perm_exp); break; + case KW_food: thawer.get (op->stats.food); break; + case KW_dam: thawer.get (op->stats.dam); break; + case KW_wc: thawer.get (op->stats.wc); break; + case KW_ac: thawer.get (op->stats.ac); break; + case KW_nrof: thawer.get (op->nrof); break; + case KW_level: thawer.get (op->level); break; + case KW_direction: thawer.get (op->direction); break; + case KW_type: thawer.get (op->type); break; + case KW_subtype: thawer.get (op->subtype); break; + case KW_value: thawer.get (op->value); break; + case KW_weight: thawer.get (op->weight); break; + case KW_carrying: thawer.get (op->carrying); break; + case KW_attacktype: thawer.get (op->attacktype); break; + case KW_path_attuned: thawer.get (op->path_attuned); break; + case KW_path_repelled: thawer.get (op->path_repelled); break; + case KW_path_denied: thawer.get (op->path_denied); break; + case KW_invisible: thawer.get (op->invisible); break; + case KW_magic: thawer.get (op->magic); break; + case KW_state: thawer.get (op->state); break; + case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; + case KW_material: thawer.get (op->material); break; + case KW_materialname: thawer.get (op->materialname); break; /* These are the new values */ - case KW_move_block: - set_move (op->move_block, thawer.get_str ()); - break; - case KW_move_allow: - set_move (op->move_allow, thawer.get_str ()); - break; - case KW_move_type: - set_move (op->move_type, thawer.get_str ()); - break; - case KW_move_on: - set_move (op->move_on, thawer.get_str ()); - break; - case KW_move_off: - set_move (op->move_off, thawer.get_str ()); - break; - case KW_move_slow: - set_move (op->move_slow, thawer.get_str ()); - break; + case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; + case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; + case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; + case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; + case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; + case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; /* These are all legacy - any new objects should use the move_ .. values */ case KW_no_pass: @@ -933,449 +820,157 @@ add_friendly_object (op); break; - case KW_monster: - GET_FLAG (op, FLAG_MONSTER); - break; - case KW_neutral: - GET_FLAG (op, FLAG_NEUTRAL); - break; - case KW_no_attack: - GET_FLAG (op, FLAG_NO_ATTACK); - break; - case KW_no_damage: - GET_FLAG (op, FLAG_NO_DAMAGE); - break; - case KW_generator: - GET_FLAG (op, FLAG_GENERATOR); - break; - case KW_use_content_on_gen: - GET_FLAG (op, FLAG_CONTENT_ON_GEN); - break; - case KW_is_thrown: - GET_FLAG (op, FLAG_IS_THROWN); - break; - case KW_auto_apply: - GET_FLAG (op, FLAG_AUTO_APPLY); - break; - case KW_treasure: - GET_FLAG (op, FLAG_TREASURE); - break; - case KW_see_invisible: - GET_FLAG (op, FLAG_SEE_INVISIBLE); - break; - case KW_can_roll: - GET_FLAG (op, FLAG_CAN_ROLL); - break; - case KW_overlay_floor: - GET_FLAG (op, FLAG_OVERLAY_FLOOR); - break; - case KW_is_turnable: - GET_FLAG (op, FLAG_IS_TURNABLE); - break; - case KW_is_used_up: - GET_FLAG (op, FLAG_IS_USED_UP); - break; - case KW_alive: - GET_FLAG (op, FLAG_ALIVE); - break; - case KW_applied: - GET_FLAG (op, FLAG_APPLIED); - break; - case KW_unpaid: - GET_FLAG (op, FLAG_UNPAID); - break; - case KW_is_animated: - GET_FLAG (op, FLAG_ANIMATE); - break; - case KW_no_pick: - GET_FLAG (op, FLAG_NO_PICK); - break; - case KW_reflecting: - GET_FLAG (op, FLAG_REFLECTING); - break; - case KW_changing: - GET_FLAG (op, FLAG_CHANGING); - break; - case KW_splitting: - GET_FLAG (op, FLAG_SPLITTING); - break; - case KW_hitback: - GET_FLAG (op, FLAG_HITBACK); - break; - case KW_startequip: - GET_FLAG (op, FLAG_STARTEQUIP); - break; - case KW_blocksview: - GET_FLAG (op, FLAG_BLOCKSVIEW); - break; - case KW_undead: - GET_FLAG (op, FLAG_UNDEAD); - break; - case KW_scared: - GET_FLAG (op, FLAG_SCARED); - break; - case KW_unaggressive: - GET_FLAG (op, FLAG_UNAGGRESSIVE); - break; - case KW_reflect_missile: - GET_FLAG (op, FLAG_REFL_MISSILE); - break; - case KW_reflect_spell: - GET_FLAG (op, FLAG_REFL_SPELL); - break; - case KW_no_magic: - GET_FLAG (op, FLAG_NO_MAGIC); - break; - case KW_no_drop: - GET_FLAG (op, FLAG_NO_DROP); - break; - case KW_random_movement: - GET_FLAG (op, FLAG_RANDOM_MOVE); - break; - case KW_was_wiz: - GET_FLAG (op, FLAG_WAS_WIZ); - break; - case KW_no_fix_player: - GET_FLAG (op, FLAG_NO_FIX_PLAYER); - break; - case KW_is_lightable: - GET_FLAG (op, FLAG_IS_LIGHTABLE); - break; - case KW_tear_down: - GET_FLAG (op, FLAG_TEAR_DOWN); - break; - case KW_can_use_shield: - GET_FLAG (op, FLAG_USE_SHIELD); - break; - case KW_can_cast_spell: - GET_FLAG (op, FLAG_CAST_SPELL); - break; - case KW_can_use_scroll: - GET_FLAG (op, FLAG_USE_SCROLL); - break; - case KW_can_use_range: - GET_FLAG (op, FLAG_USE_RANGE); - break; - case KW_can_use_bow: - GET_FLAG (op, FLAG_USE_BOW); - break; - case KW_can_use_armour: - GET_FLAG (op, FLAG_USE_ARMOUR); - break; - case KW_can_use_weapon: - GET_FLAG (op, FLAG_USE_WEAPON); - break; - case KW_can_use_ring: - GET_FLAG (op, FLAG_USE_RING); - break; - case KW_has_ready_bow: - GET_FLAG (op, FLAG_READY_BOW); - break; - case KW_xrays: - GET_FLAG (op, FLAG_XRAYS); - break; - case KW_is_floor: - GET_FLAG (op, FLAG_IS_FLOOR); - break; - case KW_lifesave: - GET_FLAG (op, FLAG_LIFESAVE); - break; - case KW_no_strength: - GET_FLAG (op, FLAG_NO_STRENGTH); - break; - case KW_sleep: - GET_FLAG (op, FLAG_SLEEP); - break; - case KW_stand_still: - GET_FLAG (op, FLAG_STAND_STILL); - break; - case KW_random_move: - GET_FLAG (op, FLAG_RANDOM_MOVE); - break; - case KW_only_attack: - GET_FLAG (op, FLAG_ONLY_ATTACK); - break; - case KW_activate_on_push: - GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); - break; - case KW_activate_on_release: - GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); - break; - case KW_confused: - GET_FLAG (op, FLAG_CONFUSED); - break; - case KW_stealth: - GET_FLAG (op, FLAG_STEALTH); - break; - case KW_cursed: - GET_FLAG (op, FLAG_CURSED); - break; - case KW_damned: - GET_FLAG (op, FLAG_DAMNED); - break; - case KW_see_anywhere: - GET_FLAG (op, FLAG_SEE_ANYWHERE); - break; - case KW_known_magical: - GET_FLAG (op, FLAG_KNOWN_MAGICAL); - break; - case KW_known_cursed: - GET_FLAG (op, FLAG_KNOWN_CURSED); - break; - case KW_can_use_skill: - GET_FLAG (op, FLAG_CAN_USE_SKILL); - break; - case KW_been_applied: - GET_FLAG (op, FLAG_BEEN_APPLIED); - break; - case KW_has_ready_scroll: - GET_FLAG (op, FLAG_READY_SCROLL); - break; - case KW_can_use_rod: - GET_FLAG (op, FLAG_USE_ROD); - break; - case KW_can_use_horn: - GET_FLAG (op, FLAG_USE_HORN); - break; - case KW_unique: - GET_FLAG (op, FLAG_UNIQUE); - break; - case KW_make_invisible: - GET_FLAG (op, FLAG_MAKE_INVIS); - break; - case KW_inv_locked: - GET_FLAG (op, FLAG_INV_LOCKED); - break; - case KW_is_wooded: - GET_FLAG (op, FLAG_IS_WOODED); - break; - case KW_is_hilly: - GET_FLAG (op, FLAG_IS_HILLY); - break; - case KW_is_water: - GET_FLAG (op, FLAG_IS_WATER); - break; - case KW_has_ready_skill: - GET_FLAG (op, FLAG_READY_SKILL); - break; - case KW_has_ready_weapon: - GET_FLAG (op, FLAG_READY_WEAPON); - break; - case KW_no_skill_ident: - GET_FLAG (op, FLAG_NO_SKILL_IDENT); - break; - case KW_is_blind: - GET_FLAG (op, FLAG_BLIND); - break; - case KW_can_see_in_dark: - GET_FLAG (op, FLAG_SEE_IN_DARK); - break; - case KW_is_cauldron: - GET_FLAG (op, FLAG_IS_CAULDRON); - break; - case KW_no_steal: - GET_FLAG (op, FLAG_NO_STEAL); - break; - case KW_one_hit: - GET_FLAG (op, FLAG_ONE_HIT); - break; - case KW_berserk: - GET_FLAG (op, FLAG_BERSERK); - break; - case KW_is_buildable: - GET_FLAG (op, FLAG_IS_BUILDABLE); - break; - - case KW_armour: - thawer.get (op->resist[ATNR_PHYSICAL]); - break; - case KW_resist_physical: - thawer.get (op->resist[ATNR_PHYSICAL]); - break; - case KW_resist_magic: - thawer.get (op->resist[ATNR_MAGIC]); - break; - case KW_resist_fire: - thawer.get (op->resist[ATNR_FIRE]); - break; - case KW_resist_electricity: - thawer.get (op->resist[ATNR_ELECTRICITY]); - break; - case KW_resist_cold: - thawer.get (op->resist[ATNR_COLD]); - break; - case KW_resist_confusion: - thawer.get (op->resist[ATNR_CONFUSION]); - break; - case KW_resist_acid: - thawer.get (op->resist[ATNR_ACID]); - break; - case KW_resist_drain: - thawer.get (op->resist[ATNR_DRAIN]); - break; - case KW_resist_weaponmagic: - thawer.get (op->resist[ATNR_WEAPONMAGIC]); - break; - case KW_resist_ghosthit: - thawer.get (op->resist[ATNR_GHOSTHIT]); - break; - case KW_resist_poison: - thawer.get (op->resist[ATNR_POISON]); - break; - case KW_resist_slow: - thawer.get (op->resist[ATNR_SLOW]); - break; - case KW_resist_paralyze: - thawer.get (op->resist[ATNR_PARALYZE]); - break; - case KW_resist_turn_undead: - thawer.get (op->resist[ATNR_TURN_UNDEAD]); - break; - case KW_resist_fear: - thawer.get (op->resist[ATNR_FEAR]); - break; - case KW_resist_cancellation: - thawer.get (op->resist[ATNR_CANCELLATION]); - break; - case KW_resist_deplete: - thawer.get (op->resist[ATNR_DEPLETE]); - break; - case KW_resist_death: - thawer.get (op->resist[ATNR_DEATH]); - break; - case KW_resist_chaos: - thawer.get (op->resist[ATNR_CHAOS]); - break; - case KW_resist_counterspell: - thawer.get (op->resist[ATNR_COUNTERSPELL]); - break; - case KW_resist_godpower: - thawer.get (op->resist[ATNR_GODPOWER]); - break; - case KW_resist_holyword: - thawer.get (op->resist[ATNR_HOLYWORD]); - break; - case KW_resist_blind: - thawer.get (op->resist[ATNR_BLIND]); - break; - case KW_resist_internal: - thawer.get (op->resist[ATNR_INTERNAL]); - break; - case KW_resist_life_stealing: - thawer.get (op->resist[ATNR_LIFE_STEALING]); - break; - case KW_resist_disease: - thawer.get (op->resist[ATNR_DISEASE]); - break; - - case KW_luck: - thawer.get (op->stats.luck); - break; - case KW_run_away: - thawer.get (op->run_away); - break; - case KW_pick_up: - thawer.get (op->pick_up); - break; - case KW_item_power: - thawer.get (op->item_power); - break; - case KW_gen_sp_armour: - thawer.get (op->gen_sp_armour); - break; - case KW_anim_speed: - thawer.get (op->anim_speed); - break; - case KW_container: - thawer.get (op->weight_limit); - break; - case KW_will_apply: - thawer.get (op->will_apply); - break; - case KW_attack_movement: - thawer.get (op->attack_movement); - break; - case KW_move_state: - thawer.get (op->move_status); - break; - case KW_expmul: - thawer.get (op->expmul); - break; - case KW_glow_radius: - thawer.get (op->glow_radius); - break; - case KW_weapontype: - thawer.get (op->weapontype); - break; - case KW_tooltype: - thawer.get (op->tooltype); - break; - case KW_casting_time: - thawer.get (op->casting_time); - break; - case KW_elevation: - thawer.get (op->elevation); - break; - case KW_smoothlevel: - thawer.get (op->smoothlevel); - break; - case KW_client_type: - thawer.get (op->client_type); - break; - case KW_duration: - thawer.get (op->duration); - break; - case KW_range: - thawer.get (op->range); - break; - case KW_range_modifier: - thawer.get (op->range_modifier); - break; - case KW_dam_modifier: - thawer.get (op->dam_modifier); - break; - case KW_duration_modifier: - thawer.get (op->duration_modifier); - break; + case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; + case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; + case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; + case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; + case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; + case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; + case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; + case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; + case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break; + case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; + case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; + case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; + case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; + case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; + case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; + case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; + case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; + case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; + case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; + case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; + case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; + case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; + case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; + case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; + case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; + case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; + case KW_scared: GET_FLAG (op, FLAG_SCARED); break; + case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; + case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; + case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; + case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; + case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; + case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; + case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; + case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; + case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; + case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; + case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; + case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; + case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; + case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; + case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; + case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; + case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; + case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; + case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; + case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; + case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; + case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; + case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; + case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; + case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; + case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; + case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; + case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; + case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; + case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; + case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; + case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; + case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; + case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; + case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; + case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; + case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; + case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; + case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; + case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; + case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; + case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; + case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; + case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; + case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; + case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; + case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; + case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; + case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; + case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; + case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; + case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; + case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; + case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; + case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; + case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; + case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; + + case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; + case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; + case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; + case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; + case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; + case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; + case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; + case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; + case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; + case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; + case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; + case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; + case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; + case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; + case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; + case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; + case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; + case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; + case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; + case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; + case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; + case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; + case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; + case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; + case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; + case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; + case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; + + case KW_luck: thawer.get (op->stats.luck); break; + case KW_run_away: thawer.get (op->run_away); break; + case KW_pick_up: thawer.get (op->pick_up); break; + case KW_item_power: thawer.get (op->item_power); break; + case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; + case KW_anim_speed: thawer.get (op->anim_speed); break; + case KW_container: thawer.get (op->weight_limit); break; + case KW_will_apply: thawer.get (op->will_apply); break; + case KW_attack_movement: thawer.get (op->attack_movement); break; + case KW_move_state: thawer.get (op->move_status); break; + case KW_expmul: thawer.get (op->expmul); break; + case KW_glow_radius: thawer.get (op->glow_radius); break; + case KW_weapontype: thawer.get (op->weapontype); break; + case KW_tooltype: thawer.get (op->tooltype); break; + case KW_casting_time: thawer.get (op->casting_time); break; + case KW_elevation: thawer.get (op->elevation); break; + case KW_smoothlevel: thawer.get (op->smoothlevel); break; + case KW_client_type: thawer.get (op->client_type); break; + case KW_duration: thawer.get (op->duration); break; + case KW_range: thawer.get (op->range); break; + case KW_range_modifier: thawer.get (op->range_modifier); break; + case KW_dam_modifier: thawer.get (op->dam_modifier); break; + case KW_duration_modifier: thawer.get (op->duration_modifier); break; //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess //TODO: parse from other include files - case KW_body_range: - thawer.get (op->body_info[0]); - break; - case KW_body_arm: - thawer.get (op->body_info[1]); - break; - case KW_body_torso: - thawer.get (op->body_info[2]); - break; - case KW_body_head: - thawer.get (op->body_info[3]); - break; - case KW_body_neck: - thawer.get (op->body_info[4]); - break; - case KW_body_skill: - thawer.get (op->body_info[5]); - break; - case KW_body_finger: - thawer.get (op->body_info[6]); - break; - case KW_body_shoulder: - thawer.get (op->body_info[7]); - break; - case KW_body_foot: - thawer.get (op->body_info[8]); - break; - case KW_body_hand: - thawer.get (op->body_info[9]); - break; - case KW_body_wrist: - thawer.get (op->body_info[10]); - break; - case KW_body_waist: - thawer.get (op->body_info[11]); - break; + case KW_body_range: thawer.get (op->body_info[0]); break; + case KW_body_arm: thawer.get (op->body_info[1]); break; + case KW_body_torso: thawer.get (op->body_info[2]); break; + case KW_body_head: thawer.get (op->body_info[3]); break; + case KW_body_neck: thawer.get (op->body_info[4]); break; + case KW_body_skill: thawer.get (op->body_info[5]); break; + case KW_body_finger: thawer.get (op->body_info[6]); break; + case KW_body_shoulder: thawer.get (op->body_info[7]); break; + case KW_body_foot: thawer.get (op->body_info[8]); break; + case KW_body_hand: thawer.get (op->body_info[9]); break; + case KW_body_wrist: thawer.get (op->body_info[10]); break; + case KW_body_waist: thawer.get (op->body_info[11]); break; case KW_can_apply: break;