--- deliantra/server/common/loader.C 2007/05/26 15:44:02 1.85 +++ deliantra/server/common/loader.C 2009/11/16 22:31:13 1.149 @@ -1,37 +1,37 @@ /* - * CrossFire, A Multiplayer game + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * You should have received a copy of the Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . + * + * The authors can be reached via e-mail to */ -/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. - sub/add_weight will transcend the environment updating the carrying - variable. */ - #include #include #include ///////////////////////////////////////////////////////////////////////////// +extern archetype *loading_arch; + +//+GPL + /* This table is only necessary to convert objects that existed before the * spell object conversion to the new object. It was not practical * to go through every mapping looking for every potion, rod, wand, etc @@ -170,7 +170,7 @@ "spell_disarm", /* 124 */ "spell_cure_confusion", /* 125 */ "spell_restoration", /* 126 */ - "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ + "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */ "spell_counterwall", /* 128 */ "spell_cause_light_wounds", /* 129 */ "spell_cause_medium_wounds", /* 130 */ @@ -252,8 +252,6 @@ NULL }; -extern bool loading_arch; - /* This function checks the object after it has been loaded (when we * get the 'end' in the input stream). This function can be used to * deal with legacy objects where fields may have changed. It can also be used @@ -264,7 +262,7 @@ { if (type >= NUM_TYPES) { - LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); + LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ()); type = 0; } @@ -276,7 +274,7 @@ case HORN: if (slot [body_range].info != -1) { - LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); + LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info); slot [body_range].info = -1; } break; @@ -284,7 +282,7 @@ case WEAPON: if (slot [body_combat].info != -1) { - LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); + LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); slot [body_combat].info = -1; } break; @@ -292,7 +290,7 @@ case SHIELD: if (slot [body_shield].info != -1) { - LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); + LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); slot [body_shield].info = -1; } break; @@ -300,19 +298,19 @@ case PLAYER: if (slot [body_shield].info != 1) { - LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); + LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); slot [body_shield].info = 1; } if (slot [body_combat].info != 1) { - LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); + LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); slot [body_combat].info = 1; } if (slot [body_range].info != 1) { - LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); + LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info); slot [body_range].info = 1; } break; @@ -327,15 +325,15 @@ * Otherwise, what happens is that the the plural name will lose * information (appear as just 'hearts' and not 'goblins heart') */ - if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) + if (arch && name != arch->object::name && name_pl == arch->object::name_pl) name_pl = 0; if (!name_pl) name_pl = name; /* objects now have a materialname. try to patch it in */ - if (!(is_weapon () && level > 0)) - set_materialname (this, map ? map->difficulty : 5, 0); + if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) + select_material (this, map ? map->difficulty : 5); /* only do these when program is first run - a bit * excessive to do this at every run - most of this is @@ -345,10 +343,10 @@ if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) { if (!skill) - LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); - else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || - (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) - LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); + LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); + else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) || + (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) + LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); } /* We changed last_heal to gen_sp_armour, which is what it @@ -364,7 +362,7 @@ { if (last_heal) { - LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); + LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); gen_sp_armour = last_heal; last_heal = 0; } @@ -375,7 +373,7 @@ if (!item_power && ip) { if (ip > 3) - LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); + LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip); item_power = ip; } @@ -392,34 +390,46 @@ #endif } - /* Old spellcasting object - need to load in the appropiate object */ - if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || + /* old style spellcasting object (pretty common) - need to load in the appropiate object */ + /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ + if ((type == ROD + || type == WAND + || type == SCROLL + || type == HORN + || type == FIREWALL /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ - ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) + || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. + && !inv + && !loading_arch + && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! + // TODO: at least one watchout-comments is redundant - investigate/remove { - /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' + // TODO: fix firewall object on map + /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' * in that spell was stored in sp. */ + //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); insert_ob_in_ob (tmp, this); - randomitems = NULL; /* So another spell isn't created for this object */ + randomitems = 0; } /* spellbooks & runes use slaying. But not to arch name, but to spell name */ if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) { + LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); object *tmp = get_archetype_by_object_name (slaying); insert_ob_in_ob (tmp, this); - randomitems = NULL; /* So another spell isn't created for this object */ + randomitems = 0; /* So another spell isn't created for this object */ /* without this, value is all screwed up */ - value = arch->clone.value * inv->value; + value = arch->value * inv->value; } if (QUERY_FLAG (this, FLAG_MONSTER)) { if (stats.hp > stats.maxhp) { - LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); + LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); stats.maxhp = stats.hp; } @@ -429,19 +439,18 @@ } if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) - { - /* Object will duplicate it's content as part of the - * generation process. To do this, we must flag inventory - * so it remains unevaluated concerning the randomitems and - * the living (a demonlord shouldn't cast from inside generator!) - */ - flag_inv (this, FLAG_IS_A_TEMPLATE); - } + /* Object will duplicate it's content as part of the + * generation process. To do this, we must flag inventory + * so it remains unevaluated concerning the randomitems and + * the living (a demonlord shouldn't cast from inside generator!) + */ + /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ + flag_inv (this, FLAG_IS_A_TEMPLATE); - /* Handle player movers. We use move_type for player movers + /* Handle player movers. We use move_type for player movers * because they operate on their own time (move_on * would potentially cause them to be triggered when someone steps - * on them). If move_type is set, presume person knows what they + * on them). If move_type is set, presume person knows what they * are doing, otherwise, set move_type based on maxhp value. */ if (type == PLAYERMOVER) @@ -457,10 +466,23 @@ move_type = MOVE_WALK; } } + + // if the object has an animation, try to provide a default face + if (has_anim ()) + { + const animation &anim_ob = anim (); + + if (anim_speed) + // if this item is time-animated, force the last frame + animate_object (this, 0); + else if (flag [FLAG_MONSTER]) + // if it is a monster, set appropriate facing + animate_object (this, direction); + } } static void -set_move (MoveType &mt, const char *str) +set_move (MoveType &mt, object_thawer &f) { static const struct flagstr { const char *name; @@ -476,13 +498,9 @@ { "all" , MOVE_ALL }, }; - if (!str) - { - mt = 0; - return; - } + const char *str = f.get_str (); - if (isdigit (*str)) + if (!*str || isdigit (*str)) { mt = atoi (str); return; @@ -490,7 +508,7 @@ mt = 0; - for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) + for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) { bool negate = 0; @@ -513,37 +531,32 @@ } } - LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); + LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); next: ; } } +//-GPL + #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () bool object::parse_kv (object_thawer &f) { object *op_inv = inv; + key_value *last_kv = key_values; for (;;) { switch (f.kw) { case KW_uuid: - if (const char *s = f.get_str ()) + if (!uuid.parse (f.get_str ())) { - unsigned int version; - unsigned long long seq; - - if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) - { - uuid.seq = seq; - break; - } + f.parse_warn ("unparseable uuid"); + uuid = UUID::gen (); } - - uuid = gen_uuid (); break; case KW_oid: @@ -559,17 +572,18 @@ case KW_skill: f.get_ornull (skill); break; case KW_race: f.get_ornull (race); break; case KW_slaying: f.get_ornull (slaying); break; + case KW_tag: f.get_ornull (tag); break; case KW_arch: - { - object *tmp = object::read (f); - tmp->deactivate (); - + if (object *tmp = object::read (f)) { + tmp->deactivate (); + // was: insert_ob_in_ob (tmp, op); // but manually adding it can improve map loading times a lot // also, appending instead of prepending keeps the // save ordering the same between repeated load/saves. + // and finally we do not want any funny effects CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); CLEAR_FLAG (tmp, FLAG_REMOVED); @@ -591,17 +605,25 @@ tmp->env = this; op_inv = tmp; } - } + else + LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); + continue; case KW_other_arch: - other_arch = - loading_arch - ? archetype::get (f.get_str ()) - : archetype::find (f.get_str ()); + if (loading_arch == this) + archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); + else + { + other_arch = archetype::find (f.get_str ()); + + if (!other_arch) + f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); + } + break; - if (!other_arch) - LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); + case KW_owner: + f.delayed_deref (this, owner, f.get_str ()); break; case KW_animation: @@ -609,9 +631,8 @@ CLEAR_FLAG (this, FLAG_ANIMATE); animation_id = 0; - const char *str = f.get_str (); - if (str && (animation_id = find_animation (str))) - SET_FLAG (this, FLAG_ANIMATE); + if (f.has_value () && (animation_id = find_animation (f.get_str ()))) + SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here } break; @@ -637,7 +658,29 @@ break; case KW_face: - face = face_find (f.get_str ()); + face = f.has_value () ? face_find (f.get_str ()) : blank_face; + break; + + case KW_sound: + if (f.has_value ()) + { + sound = sound_find (f.get_str ()); + if (!sound) + f.parse_warn (format ("sound '%s' not found", f.get_str ())); + } + else + sound = 0; + break; + + case KW_sound_destroy: + if (f.has_value ()) + { + sound_destroy = sound_find (f.get_str ()); + if (!sound_destroy) + f.parse_warn (format ("sound '%s' not found", f.get_str ())); + } + else + sound_destroy = 0; break; case KW_x: f.get (x); break; @@ -688,15 +731,22 @@ case KW_state: f.get (state); break; case KW_move_slow_penalty: f.get (move_slow_penalty); break; case KW_material: f.get (materials); break; //TODO: nuke - case KW_materialname: f.get (materialname); break; + + case KW_materialname: + { + shstr sh; + f.get (sh); + material = name_to_material (sh); + } + break; /* These are the new values */ - case KW_move_block: set_move (move_block, f.get_str ()); break; - case KW_move_allow: set_move (move_allow, f.get_str ()); break; - case KW_move_type: set_move (move_type, f.get_str ()); break; - case KW_move_on: set_move (move_on, f.get_str ()); break; - case KW_move_off: set_move (move_off, f.get_str ()); break; - case KW_move_slow: set_move (move_slow, f.get_str ()); break; + case KW_move_block: set_move (move_block, f); break; + case KW_move_allow: set_move (move_allow, f); break; + case KW_move_type: set_move (move_type , f); break; + case KW_move_on: set_move (move_on , f); break; + case KW_move_off: set_move (move_off , f); break; + case KW_move_slow: set_move (move_slow , f); break; /* These are all legacy - any new objects should use the move_ .. values */ case KW_no_pass: @@ -798,6 +848,7 @@ case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; + case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; @@ -814,7 +865,6 @@ case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; - case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; @@ -907,12 +957,14 @@ case KW_will_apply: f.get (will_apply); break; case KW_attack_movement: f.get (attack_movement); break; case KW_move_state: f.get (move_status); break; - case KW_expmul: f.get (expmul); break; + //case KW_expmul: f.get (expmul); break;//D declared const for the time being case KW_glow_radius: f.get (glow_radius); break; case KW_weapontype: f.get (weapontype); break; - case KW_tooltype: f.get (tooltype); break; case KW_casting_time: f.get (casting_time); break; - case KW_elevation: f.get (elevation); break; + + // elevation is deprecated + case KW_elevation: break; + case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; case KW_client_type: f.get (client_type); break; case KW_duration: f.get (duration); break; @@ -941,11 +993,16 @@ break; case KW_connected: - add_button_link (this, map, f.get_sint32 ()); + { + shstr connected; + + f.get (connected); + add_link (map, connected); + } break; case KW_randomitems: - if (f.get_str ()) + if (f.has_value ()) { randomitems = loading_arch @@ -953,7 +1010,10 @@ : treasurelist::find (f.get_str ()); if (!randomitems) - LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); + { + LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); + randomitems = treasurelist::get (shstr_none); // avoid crashes + } } else randomitems = 0; @@ -961,23 +1021,10 @@ case KW_msg: f.get_ml (KW_endmsg, msg); - //TODO: allow longer messages - if (strlen (msg) >= HUGE_BUF) - { - LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); - msg = "ERROR, please report: string too long, winged.\n"; - } break; case KW_lore: f.get_ml (KW_endlore, lore); - //TODO: allow longer messages - /* Just print a warning so we can be reasonably safe - * about not overflowing the buffer. - */ - if (strlen (lore) > (HUGE_BUF / 2)) - LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", - HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); break; case KW_editable: @@ -992,7 +1039,26 @@ return true; case KW_ERROR: - set_ob_key_value (this, f.kw_str, f.value, true); + // append as key value pair (do not use kv_set as it prepends) + // we also do not even try to find old values, duplicate keys stay duplicate + { + key_value *kv = new key_value; + + kv->next = 0; + kv->key = shstr (f.kw_str); + kv->value = shstr (f.value); + + if (!last_kv) + key_values = last_kv = kv; + else + { + while (last_kv->next) + last_kv = last_kv->next; + + last_kv->next = kv; + last_kv = kv; + } + } //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D break; @@ -1016,23 +1082,21 @@ if (!arch) { LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); - arch = archetype::find ("earthwall"); + arch = archetype::find (shstr_earthwall); } assert (arch); //D maybe use exception handling of sorts? f.next (); - object *op = object::create (); - + object *op = arch->instance (); op->map = map; - arch->clone.copy_to (op); - // copy_to activates, this should be fixed properly + // instance() activates, this should be fixed properly op->deactivate (); if (!op->parse_kv (f)) { - op->destroy (true); + op->destroy (); return 0; } @@ -1051,64 +1115,12 @@ { object_thawer f (buf, (AV *)0); - f.next (); return op->parse_kv (f); } -/* This returns a string of the integer movement type */ -#if 0 -// unused function -static char * -get_string_move_type (MoveType mt) -{ - static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; - int i, all_count = 0, count; - - strcpy (retbuf, ""); - strcpy (retbuf_all, " all"); - - /* Quick check, and probably fairly common */ - if (mt == MOVE_ALL) - return retbuf_all + 1; - if (mt == 0) - { - strcpy (retbuf, "0"); - return retbuf; - } - - /* We basically slide the bits down. Why look at MOVE_ALL? - * because we may want to return a string like 'all -swim', - * and if we just looked at mt, we couldn't get that. - */ - for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) - { - if (mt & (1 << count)) - { - strcat (retbuf, " "); - strcat (retbuf, move_name[count]); - } - else - { - strcat (retbuf_all, " -"); - strcat (retbuf_all, move_name[count]); - all_count++; - } - } - /* Basically, if there is a single negation, return it, eg - * 'all -swim'. But more than that, just return the - * enumerated values. It doesn't make sense to return - * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' - */ - if (all_count <= 1) - return retbuf_all + 1; - else - return retbuf + 1; -} -#endif - -// compare *op against *tmp and output differences +// compare *op against *arch and output differences static void -write_diff (object_freezer &f, object *op, object *tmp) +write_diff (object_freezer &f, object *op, object *arch) { static const keyword resist_save[NROFATTACKS] = { # define def(uc, lc, name, plus, change) KW_resist_ ## lc, @@ -1132,8 +1144,8 @@ KW_can_use_shield, KW_no_pick, KW_NULL, // walk_on - KW_NULL, // no_pass /* 10 */ + KW_NULL, // no_pass KW_is_animated, KW_NULL, // slow_move KW_NULL, // flying @@ -1143,8 +1155,8 @@ KW_is_thrown, KW_auto_apply, KW_treasure_env, - KW_player_sold, /* 20 */ + KW_player_sold, KW_see_invisible, KW_can_roll, KW_overlay_floor, @@ -1154,8 +1166,8 @@ KW_NULL, // fly_off KW_is_used_up, KW_identified, - KW_reflecting, /* 30 */ + KW_reflecting, KW_changing, KW_splitting, KW_hitback, @@ -1165,10 +1177,10 @@ KW_scared, KW_unaggressive, KW_reflect_missile, - KW_reflect_spell, /* 40 */ + KW_reflect_spell, KW_no_magic, - KW_no_fix_player, + KW_NULL, KW_is_lightable, KW_tear_down, KW_run_away, @@ -1176,8 +1188,8 @@ KW_NULL, // an_pass_thru KW_pick_up, KW_unique, - KW_no_drop, /* 50 */ + KW_no_drop, KW_NULL, // wizcast KW_can_cast_spell, KW_can_use_scroll, @@ -1187,8 +1199,8 @@ KW_can_use_weapon, KW_can_use_ring, KW_has_ready_range, - KW_has_ready_bow, /* 60 */ + KW_has_ready_bow, KW_xrays, KW_NULL, KW_is_floor, @@ -1198,8 +1210,8 @@ KW_stand_still, KW_random_move, KW_only_attack, - KW_confused, /* 70 */ + KW_confused, KW_stealth, KW_NULL, KW_NULL, @@ -1209,8 +1221,8 @@ KW_known_magical, KW_known_cursed, KW_can_use_skill, - KW_been_applied, /* 80 */ + KW_been_applied, KW_has_ready_scroll, KW_can_use_rod, KW_precious, @@ -1220,8 +1232,8 @@ KW_is_wooded, KW_is_hilly, KW_has_ready_skill, - KW_has_ready_weapon, /* 90 */ + KW_has_ready_weapon, KW_no_skill_ident, KW_is_blind, KW_can_see_in_dark, @@ -1231,8 +1243,8 @@ KW_one_hit, KW_NULL, KW_berserk, - KW_neutral, /* 100 */ + KW_neutral, KW_no_attack, KW_no_damage, KW_obj_original, @@ -1242,66 +1254,108 @@ KW_is_water, KW_use_content_on_gen, KW_NULL, - KW_is_buildable, /* 110 */ + KW_is_buildable, KW_destroy_on_death, KW_NULL, }; - int i; + // obj_original is the only commonly differing flag between archetype + // and object, so special-case it here to be able to skip the loop + static const struct flagmask : object::flags_t + { + flagmask () + { + for (int i = 0; i < NUM_FLAGS; i++) + if (flag_names [i]) + set (i); + } + } flagmask; /* This saves the key/value lists. We do it first so that any * keys that match field names will be overwritten by the loader. */ - for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) + for (key_value *kv = op->key_values; kv; kv = kv->next) + if (!arch->key_values || arch->kv (kv->key) != kv->value) + f.put (kv->key, kv->value); + + if (op->uuid) { - /* Find the field in the opposing member. */ - key_value *arch_field = get_ob_key_link (tmp, my_field->key); + // highly optimised - this is often 25% of all data written + char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); + char *ptr = cur; + + memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); + ptr += sizeof ("uuid ") - 1; + ptr = op->uuid.append (ptr); + *ptr++ = '\n'; - /* If there's no partnering field, or it's got a different value, save our field. */ - if (!arch_field || my_field->value != arch_field->value) - f.put (my_field->key, my_field->value); + f.alloc (ptr - cur); } - /* We don't need to worry about the arch's extra fields - they - * will get taken care of the copy_to method. - */ +#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v) +#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v) - { - char uids[64]; - snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); - f.put (KW_uuid, (const char *)uids); - } + CMP_OUT (x); + CMP_OUT (y); -#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) -#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) + CMP_OUT (type); + CMP_OUT (subtype); + CMP_OUT (direction); CMP_OUT (name); CMP_OUT (name_pl); - CMP_OUT (custom_name); + + CMP_OUT (speed); + + // speed_left is a major time-burner, and has good locality, so + // we use a simple lookup-cache to avoid the very slow printf. + if (op->speed_left != arch->speed_left) + { + static double last_speed_left = 0.; + static char last_speed_left_str [256] = "speed_left 0\n"; + static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; + + if (last_speed_left != op->speed_left) + { + last_speed_left = op->speed_left; + last_speed_left_len = sizeof ("speed_left ") - 1 + + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); + } + + f.add (last_speed_left_str, last_speed_left_len); + } + CMP_OUT (title); CMP_OUT (race); CMP_OUT (slaying); + CMP_OUT (skill); + + CMP_OUT (tag); + CMP_OUT (custom_name); + + if (object *owner = op->owner) + f.put (KW(owner), static_cast(owner->ref ())); - if (op->msg != tmp->msg) - f.put (KW_msg, KW_endmsg, op->msg); - if (op->lore != tmp->lore) - f.put (KW_lore, KW_endlore, op->lore); + // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved CMP_OUT (other_arch); - if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); + if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); + if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); - if (op->animation_id != tmp->animation_id) - if (op->animation_id) + if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); + if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); + if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); + + if (op->animation_id != arch->animation_id) + if (op->has_anim ()) + f.put (KW(animation), op->anim ().name); + else { - f.put (KW_animation, animations[GET_ANIM_ID (op)].name); - - if (!QUERY_FLAG (op, FLAG_ANIMATE)) - f.put (KW_is_animated, (sint32) 0); + f.put (KW(animation)); + op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? } - else - f.put (KW_animation, (const char *) 0); CMP_OUT2 (str, stats.Str); CMP_OUT2 (dex, stats.Dex); @@ -1320,7 +1374,7 @@ CMP_OUT2 (exp, stats.exp); CMP_OUT (perm_exp); - CMP_OUT (expmul); + //CMP_OUT (expmul); CMP_OUT2 (food, stats.food); CMP_OUT2 (dam, stats.dam); @@ -1328,28 +1382,25 @@ CMP_OUT2 (wc, stats.wc); CMP_OUT2 (ac, stats.ac); - CMP_OUT (x); - CMP_OUT (y); - CMP_OUT (speed); - CMP_OUT (speed_left); CMP_OUT2 (move_state, move_status); CMP_OUT (attack_movement); CMP_OUT (nrof); CMP_OUT (level); - CMP_OUT (direction); - CMP_OUT (type); - CMP_OUT (subtype); CMP_OUT (attacktype); - for (i = 0; i < NROFATTACKS; i++) - if (op->resist[i] != tmp->resist[i]) + // using memcmp here seems to be a loss - is gcc vectorising? + for (int i = 0; i < NROFATTACKS; i++) + if (expect_false (op->resist[i] != arch->resist[i])) f.put (resist_save[i], op->resist[i]); CMP_OUT (path_attuned); CMP_OUT (path_repelled); CMP_OUT (path_denied); + CMP_OUT2 (material, materials);//TODO: nuke - CMP_OUT (materialname); + if (op->material != arch->material) + f.put (KW(materialname), op->material->name); + CMP_OUT (value); CMP_OUT (carrying); CMP_OUT (weight); @@ -1362,8 +1413,9 @@ CMP_OUT (last_eat); CMP_OUT (glow_radius); - if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) - f.put (KW_connected, i); + if (op->flag [FLAG_IS_LINKED]) + if (auto (ol, op->find_link ())) + f.put (KW(connected), ol->id); CMP_OUT (randomitems); CMP_OUT2 (container, weight_limit); @@ -1373,8 +1425,6 @@ CMP_OUT (will_apply); CMP_OUT (smoothlevel); CMP_OUT (weapontype); - CMP_OUT (tooltype); - CMP_OUT (elevation); CMP_OUT (client_type); CMP_OUT (item_power); CMP_OUT (duration); @@ -1392,14 +1442,22 @@ CMP_OUT (move_slow); CMP_OUT (move_slow_penalty); - if (op->flag != tmp->flag) - for (i = 0; i <= NUM_FLAGS; i++) - 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++) - if (op->slot[i].info != tmp->slot[i].info) + object::flags_t diff = (op->flag ^ arch->flag) & flagmask; + + if (diff [FLAG_OBJ_ORIGINAL]) + f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); + + diff.reset (FLAG_OBJ_ORIGINAL); + + // quickly test whether any other flags differ + if (expect_true (diff.any ())) + for (int i = 0; i < NUM_FLAGS; i++) + if (expect_false (diff [i])) + f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); + + // save body locations. gcc's memcmp does an abysmal job when used + for (int i = 0; i < NUM_BODY_LOCATIONS; i++) + if (expect_false (op->slot[i].info != arch->slot[i].info)) f.put (body_locations[i].save_name, op->slot[i].info); } @@ -1411,22 +1469,22 @@ bool object::write (object_freezer &f) { - /* Even if the object does have an owner, it would seem that we should - * still save it. - */ - if (owner) - return true; - - archetype *at = arch ? (archetype *)arch : empty_archetype; - - f.put (KW_arch, at->name); - write_diff (f, this, &at->clone); + if (expect_false (is_arch ())) + { + f.put (KW(object), arch->archname); + write_diff (f, this, archetype::empty); + } + else + { + f.put (KW(arch), arch->archname); + write_diff (f, this, arch); + } for (object *tmp = inv; tmp; tmp = tmp->below) tmp->write (f); f.put (this); - f.put (KW_end); + f.put (KW(end)); return true; } @@ -1435,53 +1493,41 @@ // generic resource file load, // currently supports: region, treasures, archetypes -bool load_resource_file (const char *filename) +bool +load_resource_file_ (const char *filename) { object_thawer f (filename); - bool success = false; - bool seen_arch = false; - - f.next (); - for (;;) { switch (f.kw) { case KW_region: if (!region::read (f)) - goto finish; + return false; break; case KW_treasure: case KW_treasureone: if (!treasurelist::read (f)) - goto finish; + return false; break; case KW_object: - seen_arch = true; if (!archetype::read (f)) - goto finish; + return false; break; case KW_EOF: - success = true; - goto finish; + return true; default: if (!f.parse_error ("resource file")) - goto finish; + return false; f.next (); break; } } - -finish: - if (seen_arch) - init_archetype_pointers (); - - return success; }