--- deliantra/server/common/loader.C	2012/02/03 02:04:11	1.174
+++ deliantra/server/common/loader.C	2018/11/14 19:40:44	1.180
@@ -1,24 +1,24 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / 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
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -252,7 +252,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 +295,14 @@
           }
         break;
 
+      case CONTAINER:
+        if (nrof)
+          {
+            LOG (llevError, "ITEMBUG: %s: stackable container\n", debug_desc ());
+            nrof = 0;
+          }
+        break;
+
       case PLAYER:
         if (slot [body_shield].info != 1)
           {
@@ -323,7 +331,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;
@@ -632,11 +640,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;
 
@@ -1242,6 +1250,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);
         }