--- deliantra/server/common/loader.C	2008/05/03 11:14:50	1.114
+++ deliantra/server/common/loader.C	2008/06/15 20:29:56	1.117
@@ -407,7 +407,7 @@
       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;
     }
@@ -609,7 +609,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;
 
@@ -923,7 +923,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;
@@ -1300,14 +1303,12 @@
 
   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);
@@ -1381,7 +1382,6 @@
   CMP_OUT (smoothlevel);
   CMP_OUT (weapontype);
   CMP_OUT (tooltype);
-  CMP_OUT (elevation);
   CMP_OUT (client_type);
   CMP_OUT (item_power);
   CMP_OUT (duration);