--- deliantra/server/common/loader.C 2007/08/01 01:53:13 1.96
+++ deliantra/server/common/loader.C 2008/08/31 15:49:13 1.118
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 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
*
- * Crossfire TRT 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 3 of the License, or
* (at your option) any later version.
@@ -18,19 +18,17 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * 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;
+
/* 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
@@ -169,7 +167,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 */
@@ -251,8 +249,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
@@ -363,7 +359,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;
}
@@ -392,24 +388,34 @@
}
/* Old spellcasting object - need to load in the appropiate object */
- if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
+ 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
+ && !randomitems) // by elmex: not _any_ rod or horn we find on a map, which has randomitems is an old spellcasting
+ // object. For instance lythanders pipe got it's spell in the treasurelist in the randomitems,
+ // same goes for normal rods.
{
- /* 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 */
}
/* 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 */
+ randomitems = 0; /* So another spell isn't created for this object */
/* without this, value is all screwed up */
value = arch->value * inv->value;
}
@@ -418,7 +424,7 @@
{
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;
}
@@ -428,19 +434,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)
@@ -512,7 +517,7 @@
}
}
- 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: ;
}
@@ -524,6 +529,7 @@
object::parse_kv (object_thawer &f)
{
object *op_inv = inv;
+ key_value *last_kv = key_values;
for (;;)
{
@@ -531,18 +537,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:
@@ -558,6 +557,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:
{
@@ -569,6 +569,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);
@@ -594,13 +595,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:
@@ -610,7 +617,7 @@
const char *str = f.get_str ();
if (str && (animation_id = find_animation (str)))
- SET_FLAG (this, FLAG_ANIMATE);
+ SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
}
break;
@@ -641,10 +648,14 @@
case KW_sound:
sound = sound_find (f.get_str ());
+ if (!sound)
+ f.parse_warn ("sound not found");
break;
- case KW_sound_die:
- sound_die = sound_find (f.get_str ());
+ 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;
@@ -805,6 +816,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;
@@ -919,7 +931,10 @@
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;
@@ -986,7 +1001,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;
@@ -1017,11 +1051,9 @@
f.next ();
- object *op = object::create ();
-
+ object *op = arch->instance ();
op->map = map;
- arch->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))
@@ -1045,7 +1077,6 @@
{
object_thawer f (buf, (AV *)0);
- f.next ();
return op->parse_kv (f);
}
@@ -1242,59 +1273,50 @@
KW_NULL,
};
- int i;
-
/* 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)
- {
- /* Find the field in the opposing member. */
- 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 || my_field->value != arch_field->value)
- f.put (my_field->key, my_field->value);
- }
+ for (key_value *kv = op->key_values; kv; kv = kv->next)
+ if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
+ f.put (kv->key, kv->value);
/* We don't need to worry about the arch's extra fields - they
* 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 (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)
+#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)
+
+ if (object *owner = op->owner)
+ f.put (KW_owner, static_cast(owner->ref ()));
CMP_OUT (name);
CMP_OUT (name_pl);
CMP_OUT (custom_name);
CMP_OUT (title);
CMP_OUT (race);
+ CMP_OUT (skill);
CMP_OUT (slaying);
+ CMP_OUT (tag);
CMP_OUT (other_arch);
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_die != tmp->sound_die) f.put (KW_sound_die, op->sound_die ? &faces [op->sound_die] : 0);
+ 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)
+ f.put (KW_animation, animations[GET_ANIM_ID (op)].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, (const char *)0);
+ 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);
@@ -1334,8 +1356,8 @@
CMP_OUT (subtype);
CMP_OUT (attacktype);
- for (i = 0; i < NROFATTACKS; i++)
- if (op->resist[i] != tmp->resist[i])
+ for (int i = 0; i < NROFATTACKS; i++)
+ if (expect_false (op->resist[i] != tmp->resist[i]))
f.put (resist_save[i], op->resist[i]);
CMP_OUT (path_attuned);
@@ -1355,8 +1377,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 (int i = get_button_value (op))
+ f.put (KW_connected, i);
CMP_OUT (randomitems);
CMP_OUT2 (container, weight_limit);
@@ -1367,7 +1390,6 @@
CMP_OUT (smoothlevel);
CMP_OUT (weapontype);
CMP_OUT (tooltype);
- CMP_OUT (elevation);
CMP_OUT (client_type);
CMP_OUT (item_power);
CMP_OUT (duration);
@@ -1386,13 +1408,13 @@
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])
+ for (int i = 0; i <= NUM_FLAGS; 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)
+ for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
+ if (expect_false (op->slot[i].info != tmp->slot[i].info))
f.put (body_locations[i].save_name, op->slot[i].info);
}
@@ -1404,13 +1426,7 @@
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 ? arch : archetype::empty;
f.put (KW_arch, at->archname);
write_diff (f, this, at);
@@ -1428,53 +1444,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;
}