--- deliantra/server/common/loader.C	2008/05/04 19:14:23	1.115
+++ deliantra/server/common/loader.C	2008/08/31 15:49:13	1.118
@@ -388,9 +388,18 @@
     }
 
   /* Old spellcasting object - need to load in the appropiate object */
-  if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
+  if ((type == ROD
+       || type == WAND
+       || type == SCROLL
+       || type == HORN
+       || type == FIREWALL
        /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
-       ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
+       || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
+      && !inv
+      && !loading_arch
+      && !randomitems) // by elmex: not _any_ rod or horn we find on a map, which has randomitems is an old spellcasting
+                       //           object. For instance lythanders pipe got it's spell in the treasurelist in the randomitems,
+                       //           same goes for normal rods.
     {
       /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
        * in that spell was stored in sp.
@@ -398,7 +407,6 @@
       LOG (llevError, "old spellcasting object found: %s", debug_desc ());
       object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
       insert_ob_in_ob (tmp, this);
-      randomitems = NULL;   /* So another spell isn't created for this object */
     }
 
   /* spellbooks & runes use slaying.  But not to arch name, but to spell name */
@@ -609,7 +617,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 +931,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 +1311,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 +1390,6 @@
   CMP_OUT (smoothlevel);
   CMP_OUT (weapontype);
   CMP_OUT (tooltype);
-  CMP_OUT (elevation);
   CMP_OUT (client_type);
   CMP_OUT (item_power);
   CMP_OUT (duration);