--- deliantra/server/common/loader.C 2007/05/12 16:06:41 1.80 +++ deliantra/server/common/loader.C 2008/04/20 00:44:12 1.109 @@ -1,25 +1,24 @@ /* - * 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 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 + * Deliantra 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 + * 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 + * 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. @@ -32,6 +31,8 @@ ///////////////////////////////////////////////////////////////////////////// +extern archetype *loading_arch; + /* 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 +171,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 +253,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 @@ -262,13 +261,18 @@ void object::post_load_check () { + if (type >= NUM_TYPES) + { + LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); + type = 0; + } + switch (type) { case BOW: case WAND: case ROD: case HORN: - case SKILL_TOOL: if (slot [body_range].info != -1) { LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); @@ -322,7 +326,7 @@ * 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) @@ -359,7 +363,7 @@ { if (last_heal) { - LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); + LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); gen_sp_armour = last_heal; last_heal = 0; } @@ -381,8 +385,10 @@ * similarly, it item_power is 0, the first check will always pass, * but not the second one. */ +#if 0 //TODO if (ip > 2 * item_power && ip > (item_power + 3)) LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); +#endif } /* Old spellcasting object - need to load in the appropiate object */ @@ -390,9 +396,10 @@ /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) { - /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' + /* 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 */ @@ -401,18 +408,19 @@ /* spellbooks & runes use slaying. But not to arch name, but to spell name */ if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) { + LOG (llevError, "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 */ /* 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, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); stats.maxhp = stats.hp; } @@ -422,19 +430,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) @@ -506,17 +513,13 @@ } } - 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: ; } } -#define GET_FLAG(op,flag) \ - if (f.get_sint32 ()) \ - SET_FLAG (op, flag); \ - else \ - CLEAR_FLAG (op, flag) \ +#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () bool object::parse_kv (object_thawer &f) @@ -529,18 +532,11 @@ { case KW_uuid: if (const char *s = f.get_str ()) - { - unsigned int version; - unsigned long long seq; - - if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) - { - uuid.seq = seq; - break; - } - } - - uuid = gen_uuid (); + if (!uuid.parse (s)) + { + f.parse_warn ("unparseable uuid"); + uuid = UUID::gen (); + } break; case KW_oid: @@ -556,6 +552,7 @@ 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: { @@ -567,6 +564,7 @@ // 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); @@ -592,13 +590,19 @@ 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: @@ -637,6 +641,18 @@ face = face_find (f.get_str ()); break; + case KW_sound: + sound = sound_find (f.get_str ()); + if (!sound) + f.parse_warn ("sound not found"); + break; + + case KW_sound_destroy: + sound_destroy = sound_find (f.get_str ()); + if (!sound_destroy) + f.parse_warn ("sound not found"); + break; + case KW_x: f.get (x); break; case KW_y: f.get (y); break; @@ -771,24 +787,8 @@ break; - case KW_wiz: - GET_FLAG (this, FLAG_WIZ); - //TODO: move to check_object - if (QUERY_FLAG (this, FLAG_WIZ)) - { - SET_FLAG (this, FLAG_WAS_WIZ); - SET_FLAG (this, FLAG_WIZPASS); - SET_FLAG (this, FLAG_WIZCAST); - } - else - { - CLEAR_FLAG (this, FLAG_WIZPASS); - CLEAR_FLAG (this, FLAG_WIZCAST); - } - break; - case KW_friendly: - if (f.get_sint32 ()) + if (f.get_bool ()) if (type != PLAYER) add_friendly_object (this); @@ -811,6 +811,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; @@ -827,7 +828,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_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); 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; @@ -975,23 +975,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: @@ -1040,7 +1027,7 @@ object *op = object::create (); op->map = map; - arch->clone.copy_to (op); + arch->copy_to (op); // copy_to activates, this should be fixed properly op->deactivate (); @@ -1065,7 +1052,6 @@ { object_thawer f (buf, (AV *)0); - f.next (); return op->parse_kv (f); } @@ -1137,10 +1123,10 @@ */ static const keyword flag_names [NUM_FLAGS] = { KW_alive, - KW_wiz, KW_NULL, KW_NULL, - KW_was_wiz, + KW_NULL, + KW_NULL, KW_applied, KW_unpaid, KW_can_use_shield, @@ -1281,14 +1267,13 @@ * will get taken care of the copy_to method. */ - { - char uids[64]; - snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); - f.put (KW_uuid, (const char *)uids); - } + f.put (KW_uuid, op->uuid.c_str ()); + +#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) +#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) -#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) + if (object *owner = op->owner) + f.put (KW_owner, static_cast(owner->ref ())); CMP_OUT (name); CMP_OUT (name_pl); @@ -1296,15 +1281,15 @@ CMP_OUT (title); CMP_OUT (race); CMP_OUT (slaying); - - 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); - + CMP_OUT (tag); CMP_OUT (other_arch); - if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); + 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); + + if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); + if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); + if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); if (op->animation_id != tmp->animation_id) if (op->animation_id) @@ -1312,10 +1297,10 @@ 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_is_animated, (sint32)0); } else - f.put (KW_animation, (const char *) 0); + f.put (KW_animation, (const char *)0); CMP_OUT2 (str, stats.Str); CMP_OUT2 (dex, stats.Dex); @@ -1356,7 +1341,7 @@ CMP_OUT (attacktype); for (i = 0; i < NROFATTACKS; i++) - if (op->resist[i] != tmp->resist[i]) + if (expect_false (op->resist[i] != tmp->resist[i])) f.put (resist_save[i], op->resist[i]); CMP_OUT (path_attuned); @@ -1408,12 +1393,12 @@ if (op->flag != tmp->flag) for (i = 0; i <= NUM_FLAGS; i++) - if (flag_names [i] && op->flag [i] != tmp->flag [i]) + if (expect_false (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) + if (expect_false (op->slot[i].info != tmp->slot[i].info)) f.put (body_locations[i].save_name, op->slot[i].info); } @@ -1425,16 +1410,10 @@ 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; + archetype *at = arch ? (archetype *)arch : archetype::empty; - f.put (KW_arch, at->name); - write_diff (f, this, &at->clone); + f.put (KW_arch, at->archname); + write_diff (f, this, at); for (object *tmp = inv; tmp; tmp = tmp->below) tmp->write (f); @@ -1449,53 +1428,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; }