--- deliantra/server/server/spell_attack.C	2009/11/06 12:49:19	1.89
+++ deliantra/server/server/spell_attack.C	2010/03/26 00:53:26	1.97
@@ -95,7 +95,7 @@
            * I don't see us doing anything useful with that information
            * right now.
            */
-          move_object (tmp, absdir (op->stats.sp));
+          tmp->move (absdir (op->stats.sp));
         }
 
     }
@@ -110,7 +110,7 @@
 /* Causes op to fork. op is the original bolt, tmp
  * is the first piece of the fork.
  */
-void
+static void
 forklightning (object *op, object *tmp)
 {
   int new_dir = 1;              /* direction or -1 for left, +1 for right 0 if no new bolt */
@@ -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;
@@ -662,6 +662,19 @@
 
   tmp->map = newmap;
 
+  // in case the bullet has direction 0 we explode it in place.
+  // direction 0 is possible for instance when a poison cloud trap springs.
+  if (tmp->direction == 0)
+    {
+      if (tmp->other_arch
+          && (tmp = tmp->insert_at (tmp, op))) // insert before explode cleanly
+        explode_bullet (tmp);     // explode object will/should remove tmp
+      else
+        tmp->destroy ();
+
+      return 0;
+    }
+
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
@@ -692,7 +705,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 +876,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 +988,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 +1032,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);
@@ -1049,7 +1062,7 @@
  * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
  * this info is used for blocked magic/unholy spaces.
  */
-object *
+static object *
 get_pointed_target (object *op, int dir, int range, int type)
 {
   object *target;
@@ -1123,7 +1136,7 @@
     }
 
   if (spell->other_arch)
-    effect = arch_to_object (spell->other_arch);
+    effect = spell->other_arch->instance ();
   else
     return 0;
 
@@ -1246,7 +1259,7 @@
  * make this work for non-living objects, we would have to 
  * give them the capability to have an inventory. b.t.
  */
-int
+static int
 make_object_glow (object *op, int radius, int time)
 {
   /* some things are unaffected... */
@@ -1289,33 +1302,38 @@
 
   op->change_skill (find_skill_by_name (op, op->skill));
 
-  unordered_mapwalk (op, -range, -range, range, range)
+  dynbuf buf;
+  unordered_mapwalk (buf, op, -range, -range, range, range)
     {
       mapspace &ms = m->at (nx, ny);
 
       if (ms.flags () & P_IS_ALIVE)
-        for (object *tmp = ms.bot; tmp; tmp = tmp->above)
-          if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
-            {
-              tmp = tmp->head_ ();
+        for (object *next, *tmp = ms.bot; tmp; tmp = next)
+          {
+            next = tmp->above;
 
-              if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
-                  || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
-                {
-                  if (spell_ob->subtype == SP_DESTRUCTION)
-                    {
-                      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);
-                    }
-                  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);
-                    }
-                }
-            }
+            if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
+              {
+                tmp = tmp->head_ ();
+
+                if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
+                    || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
+                  {
+                    if (spell_ob->subtype == SP_DESTRUCTION)
+                      {
+                        hit_player (tmp, dam, op, spell_ob->attacktype, 0);
+
+                        if (spell_ob->other_arch)
+                          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 (spell_ob->other_arch->instance (), nx, ny, op);
+                      }
+                  }
+              }
+          }
     }
 
   op->skill = skill;
@@ -1327,7 +1345,6 @@
  * CURSE
  *
  ***************************************************************************/
-
 int
 cast_curse (object *op, object *caster, object *spell_ob, int dir)
 {
@@ -1415,8 +1432,8 @@
   change_abil (tmp, force);     /* Mostly to display any messages */
   insert_ob_in_ob (force, tmp);
   tmp->update_stats ();
-  return 1;
 
+  return 1;
 }
 
 /**********************************************************************
@@ -1455,7 +1472,8 @@
   else
     race = spell->race;
 
-  unordered_mapwalk (op, -range, -range, range, range)
+  dynbuf buf;
+  unordered_mapwalk (buf, op, -range, -range, range, range)
     {
       mapspace &ms = m->at (nx, ny);
 
@@ -1527,7 +1545,7 @@
           if (head->level > level)
             continue;
 
-          if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
+          if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
             /* Failed, no effect */
             continue;
         }
@@ -1579,7 +1597,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;
@@ -1672,7 +1690,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 */
@@ -1898,7 +1916,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");
@@ -1974,7 +1992,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);
@@ -2034,7 +2052,7 @@
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
 
                     disease->destroy ();      /* don't need this one anymore */
-                    walk->map->insert (get_archetype ("detect_magic"), x, y, op);
+                    walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
                     return 1;
                   }