--- deliantra/server/common/loader.C 2011/05/07 17:14:41 1.170
+++ deliantra/server/common/loader.C 2019/01/27 11:04:33 1.186
@@ -1,24 +1,25 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * 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
*/
@@ -252,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.
*/
@@ -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;
@@ -477,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);
@@ -525,7 +532,7 @@
str++;
}
- for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
+ for (const flagstr *f = move_flags; f < move_flags + ecb_array_length (move_flags); ++f)
{
if (!strcmp (f->name, str))
{
@@ -552,7 +559,6 @@
object::parse_kv (object_thawer &f)
{
object *op_inv = inv;
- key_value *last_kv = kv.first;
for (;;)
{
@@ -635,11 +641,11 @@
case KW_animation:
{
- this->clr_flag (FLAG_ANIMATE);
+ clr_flag (FLAG_ANIMATE);
animation_id = 0;
- if (f.has_value () && (animation_id = find_animation (f.get_str ())))
- this->set_flag (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;
@@ -795,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;
@@ -1022,8 +1029,8 @@
return 0;
}
- // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
- // that greatly simplifies the loading code.
+ // The loader reverses the ordering of kv-pairs, so we reverse it again after loading.
+ // This greatly simplifies the loading code.
op->kv.reverse ();
op->post_load_check ();
@@ -1069,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,
@@ -1219,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);
@@ -1244,6 +1251,9 @@
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);
}
@@ -1316,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);
@@ -1340,7 +1350,7 @@
CMP_OUT (glow_radius);
if (op->flag [FLAG_IS_LINKED])
- if (auto (ol, op->find_link ()))
+ if (auto ol = op->find_link ())
f.put (KW(connected), ol->id);
CMP_OUT (randomitems);
@@ -1378,9 +1388,9 @@
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]))
+ if (ecb_expect_false (diff [i]))
f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
#else
// use sgi extensions
@@ -1389,8 +1399,8 @@
#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))
+ 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);
}
@@ -1402,7 +1412,7 @@
bool
object::write (object_freezer &f)
{
- if (expect_false (is_arch ()))
+ if (ecb_expect_false (is_arch ()))
{
f.put (KW(object), arch->archname);
write_diff (f, this, archetype::empty);