--- deliantra/server/server/spell_attack.C	2009/11/11 04:45:23	1.92
+++ deliantra/server/server/spell_attack.C	2009/11/29 17:41:08	1.93
@@ -279,7 +279,7 @@
   if (!spob->other_arch)
     return 0;
 
-  tmp = arch_to_object (spob->other_arch);
+  tmp = spob->other_arch->instance ();
   if (tmp == NULL)
     return 0;
 
@@ -441,7 +441,7 @@
     }
 
   /* other_arch contains what this explodes into */
-  tmp = arch_to_object (op->other_arch);
+  tmp = op->other_arch->instance ();
 
   tmp->set_owner (op);
   tmp->skill = op->skill;
@@ -692,7 +692,7 @@
 static void
 cone_drop (object *op)
 {
-  object *new_ob = arch_to_object (op->other_arch);
+  object *new_ob = op->other_arch->instance ();
 
   new_ob->level = op->level;
   new_ob->set_owner (op->owner);
@@ -863,7 +863,7 @@
         continue;
 
       success = 1;
-      tmp = arch_to_object (spell->other_arch);
+      tmp = spell->other_arch->instance ();
       tmp->set_owner (op);
       set_spell_skill (op, caster, spell, tmp);
       tmp->level = casting_level (caster, spell);
@@ -975,7 +975,7 @@
           if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
             continue;
 
-          object *tmp = arch_to_object (at);
+          object *tmp = at->instance ();
           tmp->direction = i;
           tmp->range = op->range;
           tmp->stats.dam = op->stats.dam;
@@ -1019,7 +1019,7 @@
         }
     }
 
-  tmp = arch_to_object (spell->other_arch);
+  tmp = spell->other_arch->instance ();
 
   /*  level dependencies for bomb  */
   tmp->range = spell->range + SP_level_range_adjust (caster, spell);
@@ -1123,7 +1123,7 @@
     }
 
   if (spell->other_arch)
-    effect = arch_to_object (spell->other_arch);
+    effect = spell->other_arch->instance ();
   else
     return 0;
 
@@ -1307,12 +1307,12 @@
                       hit_player (tmp, dam, op, spell_ob->attacktype, 0);
 
                       if (spell_ob->other_arch)
-                        m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
+                        m->insert (spell_ob->other_arch->instance (), nx, ny, op);
                     }
                   else if (spell_ob->subtype == SP_FAERY_FIRE && tmp->resist [ATNR_MAGIC] != 100)
                     {
                       if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
-                        m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
+                        m->insert (spell_ob->other_arch->instance (), nx, ny, op);
                     }
                 }
             }
@@ -1578,7 +1578,7 @@
 
       /* If a monster was effected, put an effect in */
       if (done_one && spell->other_arch)
-        m->insert (arch_to_object (spell->other_arch), nx, ny, op);
+        m->insert (spell->other_arch->instance (), nx, ny, op);
     }
 
   return 1;
@@ -1671,7 +1671,7 @@
 
       /* insert the other arch */
       if (op->other_arch && !(OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, hx, hy))))
-        m->insert (arch_to_object (op->other_arch), hx, hy, op);
+        m->insert (op->other_arch->instance (), hx, hy, op);
     }
 
   /* restore to the center location and damage */
@@ -1897,7 +1897,7 @@
     }
 
   /* ok, looks groovy to just insert a new light on the map */
-  tmp = arch_to_object (spell->other_arch);
+  tmp = spell->other_arch->instance ();
   if (!tmp)
     {
       LOG (llevError, "Error: spell arch for cast_light() missing.\n");
@@ -1973,7 +1973,7 @@
           for (walk = GET_MAP_OB (m, x, y); walk; walk = walk->above)
             if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
               {                 /* found a victim */
-                object *disease = arch_to_object (spell->other_arch);
+                object *disease = spell->other_arch->instance ();
 
                 disease->set_owner (op);
                 set_spell_skill (op, caster, spell, disease);