--- deliantra/server/common/loader.C	2008/05/03 11:14:50	1.114
+++ deliantra/server/common/loader.C	2008/05/06 16:32:34	1.116
@@ -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;
 
@@ -1300,14 +1300,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);