--- deliantra/server/common/loader.C 2006/09/14 22:33:59 1.17 +++ deliantra/server/common/loader.C 2007/01/01 00:41:02 1.35 @@ -28,7 +28,6 @@ #include #include -#include #include /* Maps the MOVE_* values to names */ @@ -282,7 +281,7 @@ op->name_pl = op->name; /* objects now have a materialname. try to patch it in */ - if (!(IS_WEAPON (op) && op->level > 0)) + if (!(op->is_weapon () && op->level > 0)) { if (op->map != NULL) set_materialname (op, op->map->difficulty, NULL); @@ -490,7 +489,7 @@ CLEAR_FLAG (op, flag) \ int -parse_object (object *op, object_thawer & thawer, int map_flags) +parse_object (object *op, object_thawer &thawer, int map_flags) { bool ismore = 0; object *op_inv = op->inv; @@ -505,7 +504,7 @@ case KW_object: thawer.get (op->name); - if (op->arch != NULL) + if (op->arch) op->arch->name = op->name; break; @@ -530,30 +529,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: { @@ -569,15 +553,20 @@ object *tmp; - if (arch != NULL) + if (arch) tmp = arch_to_object (arch); else { - tmp = get_object (); + tmp = object::create (); /* record the name of the broken object */ tmp->name = str; } + // decativate the object we, as we are still going + // to read the speed value. Objects should be activated + // when the map, object or player is completly loaded. + tmp->deactivate (); + parse_object (tmp, thawer, map_flags); if (tmp->arch) @@ -610,7 +599,7 @@ else { LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); - free_object (tmp); + tmp->destroy (); } } else @@ -618,8 +607,12 @@ /* This is the actual archetype definition then */ op->arch = archetype::find (str); - if (op->arch != NULL) - copy_object (&op->arch->clone, op); + if (op->arch) + { + op->arch->clone.copy_to (op); + // copy_to activates, this should be fixed properly + op->deactivate (); + } else if (!arch_init) /* record the name of the broken object */ op->name = str; @@ -649,33 +642,19 @@ 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); //TODO: maybe do in check_object - if (!(map_flags & MAP_STYLE)) - { - if (op->speed < 0) - op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; - - update_ob_speed (op); - } + // removed check for style maps + if (op->speed < 0) + op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; break; @@ -688,151 +667,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 +824,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_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_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); 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; @@ -1388,30 +987,24 @@ break; case KW_msg: - { - thawer.get_ml (KW_endmsg, op->msg); - //TODO: allow longer messages - if (strlen (op->msg) >= HUGE_BUF) - { - LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); - op->msg = "ERROR, please report: string too long, winged.\n"; - } - } + thawer.get_ml (KW_endmsg, op->msg); + //TODO: allow longer messages + if (strlen (op->msg) >= HUGE_BUF) + { + LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); + op->msg = "ERROR, please report: string too long, winged.\n"; + } break; case KW_lore: - { - shstr msgbuf; - - thawer.get_ml (KW_endlore, op->lore); - //TODO: allow longer messages - /* Just print a warning so we can be reasonably safe - * about not overflowing the buffer. - */ - if (strlen (op->lore) > (HUGE_BUF / 2)) - LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", - HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); - } + thawer.get_ml (KW_endlore, op->lore); + //TODO: allow longer messages + /* Just print a warning so we can be reasonably safe + * about not overflowing the buffer. + */ + if (strlen (op->lore) > (HUGE_BUF / 2)) + LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", + HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); break; case KW_editable: @@ -1438,15 +1031,8 @@ return LL_EOF; case KW_ERROR: - set_ob_key_value (op, thawer.line, thawer.last_value, true); - //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D - - //TODO: skip line, ugly, factor parsing better - if (thawer.last_value) - thawer.line = thawer.last_value; - - thawer.line += strlen (thawer.line) + 1; - + set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); + //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D break; default: @@ -1470,14 +1056,15 @@ * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) * */ - int -load_object (object_thawer & fp, object *op, int map_flags) +load_object (object_thawer &fp, object *op, int map_flags) { + // cede every 500 objects loaded + coroapi::cede_every (500); + return parse_object (op, fp, map_flags); } - /* This takes a buffer, scans it for variables, and sets those variables * as appropriate in op. * @@ -1487,65 +1074,11 @@ int set_variable (object *op, char *buf) { - return 0; -#if 0 - int retval; - object_thawer thawer (0); + object_thawer thawer (buf, (AV *)0); - strcpy (msgbuf, ""); - strcpy (lorebuf, ""); - retval = parse_object (op, thawer, 0); - yy_switch_to_buffer (yycurbuf); - yy_delete_buffer (yybufstate); - yy_pop_state (); - return retval; -#endif + return parse_object (op, thawer, 0); } -/* This array equates the FLAG_ values with the V_ values. Use -1 to - * put gaps in the array that should not be processed. - * The order matches the order of the define values in 'define.h'. - */ - -/* This is a list of pointers that correspond to the FLAG_.. values. - * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then - * the 15'th element of this array should match that name. - * If an entry is NULL, that is a flag not to loaded/saved. - */ -static const char *const flag_names[NUM_FLAGS + 1] = { - "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid", - "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */ - "is_animated", NULL /* slow_move */ , - NULL /* flying */ , "monster", "friendly", "generator", - "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */ - "see_invisible", "can_roll", "overlay_floor", - "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ , - NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */ - "changing", "splitting", "hitback", "startequip", - "blocksview", "undead", "scared", "unaggressive", - "reflect_missile", "reflect_spell", /* 40 */ - "no_magic", "no_fix_player", "is_lightable", "tear_down", - "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ , - "pick_up", "unique", "no_drop", /* 50 */ - NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range", - "can_use_bow", "can_use_armour", "can_use_weapon", - "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */ - "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep", - "stand_still", "random_move", "only_attack", "confused", /* 70 */ - "stealth", NULL, NULL, "cursed", "damned", - "see_anywhere", "known_magical", "known_cursed", - "can_use_skill", "been_applied", /* 80 */ - "has_ready_scroll", "can_use_rod", NULL, - "can_use_horn", "make_invisible", "inv_locked", "is_wooded", - "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */ - "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron", - "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */ - "no_attack", "no_damage", NULL, NULL, "activate_on_push", - "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */ - NULL -}; - - /* * Initialises the array of variable-names. Needed before any * objects can be loaded. Called by init_library(). @@ -1611,6 +1144,142 @@ void put (object_freezer &f, object *op, object *tmp) { + static const keyword resist_save[NROFATTACKS] = { +# define def(uc, lc, name, plus, change) KW_resist_ ## lc, +# include "attackinc.h" +# undef def + }; + + /* This is a list of keywords that correspond to the FLAG_.. values. + * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then + * the 15'th element of this array should match that name. + * If an entry is NULL, that is a flag not to loaded/saved. + */ + static const keyword flag_names [NUM_FLAGS] = { + KW_alive, + KW_wiz, + KW_NULL, + KW_NULL, + KW_was_wiz, + KW_applied, + KW_unpaid, + KW_can_use_shield, + KW_no_pick, + KW_NULL, // walk_on + KW_NULL, // no_pass + /* 10 */ + KW_is_animated, + KW_NULL, // slow_move + KW_NULL, // flying + KW_monster, + KW_friendly, + KW_generator, + KW_is_thrown, + KW_auto_apply, + KW_NULL, // was KW_treasure + KW_player_sold, + /* 20 */ + KW_see_invisible, + KW_can_roll, + KW_overlay_floor, + KW_is_turnable, + KW_NULL, // walk_off + KW_NULL, // fly_on + KW_NULL, // fly_off + KW_is_used_up, + KW_identified, + KW_reflecting, + /* 30 */ + KW_changing, + KW_splitting, + KW_hitback, + KW_startequip, + KW_blocksview, + KW_undead, + KW_scared, + KW_unaggressive, + KW_reflect_missile, + KW_reflect_spell, + /* 40 */ + KW_no_magic, + KW_no_fix_player, + KW_is_lightable, + KW_tear_down, + KW_run_away, + KW_NULL, // pass_thru + KW_NULL, // an_pass_thru + KW_pick_up, + KW_unique, + KW_no_drop, + /* 50 */ + KW_NULL, // wizcast + KW_can_cast_spell, + KW_can_use_scroll, + KW_can_use_range, + KW_can_use_bow, + KW_can_use_armour, + KW_can_use_weapon, + KW_can_use_ring, + KW_has_ready_range, + KW_has_ready_bow, + /* 60 */ + KW_xrays, + KW_NULL, + KW_is_floor, + KW_lifesave, + KW_no_strength, + KW_sleep, + KW_stand_still, + KW_random_move, + KW_only_attack, + KW_confused, + /* 70 */ + KW_stealth, + KW_NULL, + KW_NULL, + KW_cursed, + KW_damned, + KW_see_anywhere, + KW_known_magical, + KW_known_cursed, + KW_can_use_skill, + KW_been_applied, + /* 80 */ + KW_has_ready_scroll, + KW_can_use_rod, + KW_NULL, + KW_can_use_horn, + KW_make_invisible, + KW_inv_locked, + KW_is_wooded, + KW_is_hilly, + KW_has_ready_skill, + KW_has_ready_weapon, + /* 90 */ + KW_no_skill_ident, + KW_is_blind, + KW_can_see_in_dark, + KW_is_cauldron, + KW_NULL, + KW_no_steal, + KW_one_hit, + KW_NULL, + KW_berserk, + KW_neutral, + /* 100 */ + KW_no_attack, + KW_no_damage, + KW_NULL, + KW_NULL, + KW_activate_on_push, + KW_activate_on_release, + KW_is_water, + KW_use_content_on_gen, + KW_NULL, + KW_is_buildable, + /* 110 */ + }; + int i; /* This saves the key/value lists. We do it first so that any @@ -1622,12 +1291,12 @@ key_value *arch_field = get_ob_key_link (tmp, my_field->key); /* If there's no partnering field, or it's got a different value, save our field. */ - if (arch_field == NULL || my_field->value != arch_field->value) + if (!arch_field || my_field->value != arch_field->value) f.put (my_field->key, my_field->value); } /* We don't need to worry about the arch's extra fields - they - * will get taken care of the copy_object function. + * will get taken care of the copy_to method. */ { @@ -1654,9 +1323,6 @@ CMP_OUT (other_arch); CMP_OUT (face); - if (!op->face || !op->face->name) - printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : ""); //D - if (op->animation_id != tmp->animation_id) if (op->animation_id) { @@ -1757,10 +1423,10 @@ CMP_OUT (move_slow); CMP_OUT (move_slow_penalty); - if (!COMPARE_FLAGS (op, tmp)) + if (op->flag != tmp->flag) for (i = 0; i <= NUM_FLAGS; i++) - if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) - f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); + if (flag_names [i] && op->flag [i] != tmp->flag [i]) + f.put (flag_names [i], op->flag [i] ? "1" : "0"); /* Save body locations */ for (i = 0; i < NUM_BODY_LOCATIONS; i++) @@ -1772,15 +1438,12 @@ * Dumps all variables in an object to a file. * If bit 0 of flag is set, unpaid objects will be saved. As of now, * the only place this is not set is when saving the player. - * If bit 1 of flag is set, don't remove the object after save. As of now, - * all of the callers are setting this. */ - void -save_object (object_freezer & fp, object *op, int flag) +save_object (object_freezer &fp, object *op, int flag) { - archetype *at; - object *tmp, *old; + // cede every 500 objects saved + coroapi::cede_every (500); /* Even if the object does have an owner, it would seem that we should * still save it. @@ -1789,48 +1452,20 @@ return; /* If it is unpaid and we don't want to save those, just return. */ - if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) + if (!(flag & 1) && op->flag [FLAG_UNPAID]) return; - if ((at = op->arch) == NULL) - at = empty_archetype; + archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; fp.put (KW_arch, at->name); - put (fp, op, &at->clone); /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ - old = NULL; - - if (flag & 2) - for (tmp = op->inv; tmp != NULL; tmp = tmp->below) - save_object (fp, tmp, flag); - else - /* Slightly different logic because tmp/op will be removed by - * the save_object we call. So we just keep looking at op->inv - * until there is nothing left. In theory, the variable old - * should not be needed, as recursive loops shouldn't happen. - */ - while ((tmp = op->inv) != NULL) - { - if (old == tmp) - { - LOG (llevError, " Recursive loop in inventory\n"); - break; - } - - save_object (fp, tmp, flag); - old = tmp; - } - - if (!(flag & 2)) - { - remove_ob (op); - free_object (op); - } + for (object *tmp = op->inv; tmp; tmp = tmp->below) + save_object (fp, tmp, flag); fp.put (op); - fprintf (fp, "end\n"); + fp.put (KW_end); }