--- deliantra/server/common/loader.C	2008/08/31 15:49:13	1.118
+++ deliantra/server/common/loader.C	2008/09/11 12:43:17	1.120
@@ -387,7 +387,8 @@
 #endif
     }
 
-  /* Old spellcasting object - need to load in the appropiate object */
+  /* old style spellcasting object (pretty common) - need to load in the appropiate object */
+  /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
   if ((type == ROD
        || type == WAND
        || type == SCROLL
@@ -397,16 +398,17 @@
        || ((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.
+      && stats.sp)     // watchout: old magic bullet stuff directly on the map is going to break here!
+                       // TODO: at least one watchout-comments is redundant - investigate/remove
     {
+      // TODO: fix firewall object on map
       /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
        * in that spell was stored in sp.
        */
-      LOG (llevError, "old spellcasting object found: %s", debug_desc ());
+      //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 = 0;
     }
 
   /* spellbooks & runes use slaying.  But not to arch name, but to spell name */