--- deliantra/server/common/loader.C 2009/11/10 16:29:20 1.145
+++ deliantra/server/common/loader.C 2018/12/05 19:03:26 1.185
@@ -1,29 +1,29 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * 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
- *
+ *
+ * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
* 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
* GNU General Public License for more details.
- *
+ *
* 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
*/
#include
-#include
#include
/////////////////////////////////////////////////////////////////////////////
@@ -253,7 +253,7 @@
};
/* 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
+ * 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
* to check for objects to make sure there are no common errors.
*/
@@ -268,6 +268,7 @@
switch (type)
{
+ case RANGED:
case BOW:
case WAND:
case ROD:
@@ -295,6 +296,14 @@
}
break;
+ case CONTAINER:
+ if (nrof)
+ {
+ LOG (llevError, "ITEMBUG: %s: stackable container (nrof %d)\n", debug_desc (), (int)nrof);
+ nrof = 0;
+ }
+ break;
+
case PLAYER:
if (slot [body_shield].info != 1)
{
@@ -323,7 +332,7 @@
* also have to catch is if this object is not using the normal name for
* the object. In that case, we also want to use the loaded name.
* Otherwise, what happens is that the the plural name will lose
- * information (appear as just 'hearts' and not 'goblins heart')
+ * information (appear as just 'hearts' and not 'goblins heart')
*/
if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
name_pl = 0;
@@ -335,6 +344,13 @@
if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
select_material (this, map ? map->difficulty : 5);
+ if (speed < 0.)
+ {
+ flag [FLAG_RANDOM_SPEED] = true;
+ speed = -speed;
+ // speed_left will be randomised in instantiate () and copy_to ()
+ }
+
/* only do these when program is first run - a bit
* excessive to do this at every run - most of this is
* really just to catch any errors - program will still run, but
@@ -390,7 +406,7 @@
#endif
}
- /* old style spellcasting object (pretty common) - need to load in the appropiate object */
+ /* old style spellcasting object (pretty common) - need to load in the appropriate object */
/* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
if ((type == ROD
|| type == WAND
@@ -409,7 +425,7 @@
* 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]);
+ object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
insert_ob_in_ob (tmp, this);
randomitems = 0;
}
@@ -425,7 +441,7 @@
value = arch->value * inv->value;
}
- if (QUERY_FLAG (this, FLAG_MONSTER))
+ if (this->flag [FLAG_MONSTER])
{
if (stats.hp > stats.maxhp)
{
@@ -438,7 +454,7 @@
move_type = MOVE_WALK;
}
- if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
+ if ((this->flag [FLAG_GENERATOR] && this->flag [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
@@ -470,8 +486,6 @@
// 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);
@@ -482,7 +496,7 @@
}
static void
-set_move (MoveType &mt, const char *str)
+set_move (MoveType &mt, object_thawer &f)
{
static const struct flagstr {
const char *name;
@@ -498,13 +512,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;
@@ -512,7 +522,7 @@
mt = 0;
- for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
+ for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
{
bool negate = 0;
@@ -522,7 +532,7 @@
str++;
}
- for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
+ for (const flagstr *f = move_flags; f < move_flags + ecb_array_length (move_flags); ++f)
{
if (!strcmp (f->name, str))
{
@@ -549,19 +559,17 @@
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 (s))
- {
- f.parse_warn ("unparseable uuid");
- uuid = UUID::gen ();
- }
+ if (!uuid.parse (f.get_str ()))
+ {
+ f.parse_warn ("unparseable uuid");
+ uuid = UUID::gen ();
+ }
break;
case KW_oid:
@@ -589,8 +597,8 @@
// 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);
+ tmp->clr_flag (FLAG_OBJ_ORIGINAL);
+ tmp->clr_flag (FLAG_REMOVED);
if (!op_inv)
{
@@ -633,12 +641,11 @@
case KW_animation:
{
- CLEAR_FLAG (this, FLAG_ANIMATE);
+ clr_flag (FLAG_ANIMATE);
animation_id = 0;
- const char *str = f.get_str ();
- if (str && (animation_id = find_animation (str)))
- SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
+ if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
+ set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
}
break;
@@ -646,6 +653,7 @@
case KW_last_sp: f.get (last_sp); break;
case KW_last_grace: f.get (last_grace); break;
case KW_last_eat: f.get (last_eat); break;
+ case KW_sl:
case KW_speed_left: f.get (speed_left); break;
case KW_speed:
@@ -664,19 +672,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:
- sound = sound_find (f.get_str ());
- if (!sound)
- f.parse_warn ("sound not found");
+ 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:
- sound_destroy = sound_find (f.get_str ());
- if (!sound_destroy)
- f.parse_warn ("sound not found");
+ 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;
@@ -727,96 +745,26 @@
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:
- {
- shstr sh;
- f.get (sh);
- material = name_to_material (sh);
- }
- break;
+ case KW_materialname: f.get (material); 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;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_no_pass:
- {
- if (f.get_sint32 ())
- move_block = MOVE_ALL;
- else
- move_block = 0;
- }
-
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_walk_on:
- {
- if (f.get_sint32 ())
- move_on |= MOVE_WALK;
- else
- move_on &= ~MOVE_WALK;
- }
-
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_walk_off:
- {
- if (f.get_sint32 ())
- move_off |= MOVE_WALK;
- else
- move_off &= ~MOVE_WALK;
- }
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_fly_on:
- {
- if (f.get_sint32 ())
- move_on |= MOVE_FLY_LOW;
- else
- move_on &= ~MOVE_FLY_LOW;
- }
- break;
-
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_fly_off:
- {
- if (f.get_sint32 ())
- move_off |= MOVE_FLY_LOW;
- else
- move_off &= ~MOVE_FLY_LOW;
- }
- 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;
//TODO: remove these after converting archetypes
case KW_can_use_wand:
GET_FLAG (this, FLAG_USE_RANGE);
break;
- /* These are all legacy - any new objects should use the move_ .. values */
- case KW_flying:
- {
- if (f.get_sint32 ())
- move_type |= MOVE_FLY_LOW;
- else
- move_type &= ~MOVE_FLY_LOW;
- }
- break;
-
-
case KW_identified:
GET_FLAG (this, FLAG_IDENTIFIED);
//TODO: move to check_object or so
- if (QUERY_FLAG (this, FLAG_IDENTIFIED))
- CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
+ if (this->flag [FLAG_IDENTIFIED])
+ this->clr_flag (FLAG_KNOWN_MAGICAL);
break;
@@ -853,6 +801,7 @@
case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
+ case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
@@ -861,7 +810,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;
@@ -915,6 +863,8 @@
case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
+ case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
+ case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
@@ -999,7 +949,7 @@
break;
case KW_randomitems:
- if (f.get_str ())
+ if (f.has_value ())
{
randomitems =
loading_arch
@@ -1036,27 +986,9 @@
return true;
case KW_ERROR:
- // 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
+ // we do not even try to find old values, duplicate keys stay duplicate
+ // the list gets reversed after loading
+ kv.add (shstr (f.kw_str), shstr (f.value));
break;
default:
@@ -1078,7 +1010,7 @@
if (!arch)
{
- LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
+ LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
arch = archetype::find (shstr_earthwall);
}
@@ -1097,6 +1029,10 @@
return 0;
}
+ // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
+ // that greatly simplifies the loading code.
+ op->kv.reverse ();
+
op->post_load_check ();
return op;
}
@@ -1110,7 +1046,7 @@
int
set_variable (object *op, char *buf)
{
- object_thawer f (buf, (AV *)0);
+ object_thawer f (format ("%s\nend", buf), (AV *)0);
return op->parse_kv (f);
}
@@ -1140,7 +1076,7 @@
KW_unpaid,
KW_can_use_shield,
KW_no_pick,
- KW_NULL, // walk_on
+ KW_is_transparent_floor,
/* 10 */
KW_NULL, // no_pass
KW_is_animated,
@@ -1177,7 +1113,7 @@
/* 40 */
KW_reflect_spell,
KW_no_magic,
- KW_no_fix_player,
+ KW_NULL,
KW_is_lightable,
KW_tear_down,
KW_run_away,
@@ -1245,7 +1181,7 @@
KW_no_attack,
KW_no_damage,
KW_obj_original,
- KW_NULL,
+ KW_random_speed,
KW_activate_on_push,
KW_activate_on_release,
KW_is_water,
@@ -1272,8 +1208,8 @@
/* 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 *kv = op->key_values; kv; kv = kv->next)
- if (!arch->key_values || arch->kv (kv->key) != kv->value)
+ for (key_value *kv = op->kv.first; kv; kv = kv->next)
+ if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
f.put (kv->key, kv->value);
if (op->uuid)
@@ -1290,8 +1226,8 @@
f.alloc (ptr - cur);
}
-#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)
+#define CMP_OUT(v) if (ecb_expect_false (op->v != arch->v)) f.put (KW (v), op->v)
+#define CMP_OUT2(k,v) if (ecb_expect_false (op->v != arch->v)) f.put (KW (k), op->v)
CMP_OUT (x);
CMP_OUT (y);
@@ -1302,9 +1238,28 @@
CMP_OUT (name);
CMP_OUT (name_pl);
-
CMP_OUT (speed);
- CMP_OUT (speed_left);
+
+ // 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] = "sl 0\n";
+ static int last_speed_left_len = sizeof ("sl 0\n") - 1;
+
+ if (last_speed_left != op->speed_left)
+ {
+ last_speed_left = op->speed_left;
+ // .7g loses precision even for float, but gives nice round numbers and smaller files
+ // maybe hex format or a raw binary dump of the float is good enough, more exact, and much faster?
+ // (printf is typically very slow)
+ last_speed_left_len = sizeof ("sl ") - 1
+ + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
+ }
+
+ f.add (last_speed_left_str, last_speed_left_len);
+ }
CMP_OUT (title);
CMP_OUT (race);
@@ -1315,25 +1270,26 @@
CMP_OUT (custom_name);
if (object *owner = op->owner)
- f.put (KW_owner, static_cast(owner->ref ()));
+ if (const char *ref = owner->ref ())
+ f.put (KW(owner), ref);
// memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
CMP_OUT (other_arch);
- 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->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->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->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);
+ f.put (KW(animation), op->anim ().name);
else
{
- f.put (KW_animation, (const char *)0);
+ f.put (KW(animation));
op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
}
@@ -1370,7 +1326,7 @@
// 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]))
+ if (ecb_expect_false (op->resist[i] != arch->resist[i]))
f.put (resist_save[i], op->resist[i]);
CMP_OUT (path_attuned);
@@ -1379,7 +1335,7 @@
CMP_OUT2 (material, materials);//TODO: nuke
if (op->material != arch->material)
- f.put (KW_materialname, op->material->name);
+ f.put (KW(materialname), op->material->name);
CMP_OUT (value);
CMP_OUT (carrying);
@@ -1394,10 +1350,11 @@
CMP_OUT (glow_radius);
if (op->flag [FLAG_IS_LINKED])
- if (auto (ol, op->find_link ()))
- f.put (KW_connected, ol->id);
+ if (auto ol = op->find_link ())
+ f.put (KW(connected), ol->id);
CMP_OUT (randomitems);
+
CMP_OUT2 (container, weight_limit);
CMP_OUT (run_away);
@@ -1424,21 +1381,27 @@
object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
+#if stdcpp // we need gcc, sorry
if (diff [FLAG_OBJ_ORIGINAL])
- f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
+ 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 ()))
+ if (ecb_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] ? "1" : "0");
+ if (ecb_expect_false (diff [i]))
+ f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
+#else
+ // use sgi extensions
+ for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
+ f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
+#endif
// 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);
+ for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
+ if (ecb_expect_false (op->slot[i].info != arch->slot[i].info))
+ f.put (body_locations[i].kw, op->slot[i].info);
}
/*
@@ -1449,14 +1412,14 @@
bool
object::write (object_freezer &f)
{
- if (is_arch ())
+ if (ecb_expect_false (is_arch ()))
{
- f.put (KW_object, arch->archname);
+ f.put (KW(object), arch->archname);
write_diff (f, this, archetype::empty);
}
else
{
- f.put (KW_arch, arch->archname);
+ f.put (KW(arch), arch->archname);
write_diff (f, this, arch);
}
@@ -1464,7 +1427,7 @@
tmp->write (f);
f.put (this);
- f.put (KW_end);
+ f.put (KW(end));
return true;
}
@@ -1480,6 +1443,8 @@
for (;;)
{
+ coroapi::cede_to_tick ();
+
switch (f.kw)
{
case KW_region: