--- deliantra/server/common/loader.C 2008/09/15 00:16:19 1.122 +++ deliantra/server/common/loader.C 2009/09/17 01:57:31 1.132 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * 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 * @@ -259,7 +259,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; } @@ -271,7 +271,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; @@ -279,7 +279,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; @@ -287,7 +287,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; @@ -295,19 +295,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; @@ -340,10 +340,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 @@ -359,7 +359,7 @@ { if (last_heal) { - LOG (llevError, "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; } @@ -370,7 +370,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; } @@ -414,7 +414,7 @@ /* 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 ()); + 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 = 0; /* So another spell isn't created for this object */ @@ -426,7 +426,7 @@ { if (stats.hp > stats.maxhp) { - LOG (llevInfo, "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; } @@ -463,6 +463,19 @@ 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 @@ -929,10 +942,9 @@ 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; // elevation is deprecated @@ -966,7 +978,12 @@ 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: @@ -1061,7 +1078,7 @@ if (!op->parse_kv (f)) { - op->destroy (true); + op->destroy (); return 0; } @@ -1313,8 +1330,8 @@ 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) - f.put (KW_animation, animations[GET_ANIM_ID (op)].name); + if (op->has_anim ()) + f.put (KW_animation, op->anim ().name); else { f.put (KW_animation, (const char *)0); @@ -1381,8 +1398,8 @@ CMP_OUT (glow_radius); if (op->flag [FLAG_IS_LINKED]) - if (int i = get_button_value (op)) - f.put (KW_connected, i); + if (auto (ol, op->find_link ())) + f.put (KW_connected, ol->id); CMP_OUT (randomitems); CMP_OUT2 (container, weight_limit); @@ -1392,7 +1409,6 @@ CMP_OUT (will_apply); CMP_OUT (smoothlevel); CMP_OUT (weapontype); - CMP_OUT (tooltype); CMP_OUT (client_type); CMP_OUT (item_power); CMP_OUT (duration); @@ -1429,10 +1445,16 @@ bool object::write (object_freezer &f) { - archetype *at = arch ? arch : archetype::empty; - - f.put (KW_arch, at->archname); - write_diff (f, this, at); + if (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);