--- deliantra/server/server/spell_attack.C	2008/05/18 19:53:07	1.61
+++ deliantra/server/server/spell_attack.C	2008/12/28 07:48:44	1.74
@@ -167,7 +167,7 @@
 
   if (--op->duration < 0)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
  
@@ -309,7 +309,7 @@
   mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
-      tmp->destroy ();
+      tmp->drop_and_destroy ();
       return 0;
     }
 
@@ -319,7 +319,7 @@
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
-          tmp->destroy ();
+          tmp->drop_and_destroy ();
           return 0;
         }
 
@@ -395,7 +395,7 @@
 {
   object *tmp, *owner;
 
-  if (op->other_arch == NULL)
+  if (!op->other_arch)
     {
       LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
       op->destroy ();
@@ -447,7 +447,10 @@
 
   owner = op->owner;
 
-  if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
+  if ((tmp->attacktype & AT_HOLYWORD
+       || tmp->attacktype & AT_GODPOWER)
+      && owner
+      && !tailor_god_spell (tmp, owner))
     {
       op->destroy ();
       return;
@@ -523,6 +526,7 @@
         {
           dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
 
+          // TODO: can't understand the following if's
           if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
             {
               if (!QUERY_FLAG (op, FLAG_REMOVED))
@@ -735,17 +739,22 @@
 
   hit_map (op, 0, op->attacktype, 0);
 
+  if (!op->is_on_map ())
+    return;
+
   /* Check to see if we should push anything.
    * Spell objects with weight push whatever they encounter to some
    * degree.  
    */
   if (op->weight)
-    check_spell_knockback (op);
+    {
+      check_spell_knockback (op);
 
-  if (op->destroyed ())
-    return;
+      if (!op->is_on_map ())
+        return;
+    }
 
-  if ((op->duration--) < 0)
+  if (op->duration-- < 0)
     {
       op->destroy ();
       return;
@@ -862,7 +871,7 @@
       tmp = arch_to_object (spell->other_arch);
       tmp->set_owner (op);
       set_spell_skill (op, caster, spell, tmp);
-      tmp->level = caster_level (caster, spell);
+      tmp->level = casting_level (caster, spell);
       tmp->attacktype = spell->attacktype;
 
       /* holy word stuff */
@@ -1001,10 +1010,18 @@
   maptile *m;
 
   mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
-  if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
+
+  // when creating a bomb below ourself it should always work, even
+  // when movement is blocked (somehow we got here, somehow we are here,
+  // so we should also be able to make a bomb here). (originally added
+  // to fix create bomb traps in doors, which cast with dir=0).
+  if (dir)
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
-      return 0;
+      if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
+        {
+          new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
+          return 0;
+        }
     }
 
   tmp = arch_to_object (spell->other_arch);
@@ -1114,7 +1131,7 @@
     return 0;
 
   /* tailor the effect by priest level and worshipped God */
-  effect->level = caster_level (caster, spell);
+  effect->level = casting_level (caster, spell);
   effect->attacktype = spell->attacktype;
   if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
     {
@@ -1181,7 +1198,7 @@
 {
   if (op->range-- <= 0)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
 
@@ -1243,10 +1260,7 @@
   tmp->speed = 0.01;
   tmp->stats.food = time;
   SET_FLAG (tmp, FLAG_IS_USED_UP);
-  tmp->glow_radius = radius;
-  if (tmp->glow_radius > MAX_LIGHT_RADII)
-    tmp->glow_radius = MAX_LIGHT_RADII;
-
+  tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
   tmp = insert_ob_in_ob (tmp, op);
 
   if (tmp->glow_radius > op->glow_radius)
@@ -1258,76 +1272,53 @@
 int
 cast_destruction (object *op, object *caster, object *spell_ob)
 {
-  int i, j, range, mflags, friendly = 0, dam, dur;
-  sint16 sx, sy;
-  maptile *m;
-  object *tmp;
-  const char *skill;
+  int range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
+  int dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
+  int dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
 
-  range = spell_ob->range + SP_level_range_adjust (caster, spell_ob);
-  dam = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
-  dur = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
-  if (QUERY_FLAG (op, FLAG_FRIENDLY) || op->type == PLAYER)
-    friendly = 1;
+  bool friendly = op->flag [FLAG_FRIENDLY] || op->is_player ();
 
   /* destruction doesn't use another spell object, so we need
    * update op's skill pointer so that exp is properly awarded.
-   * We do some shortcuts here - since this is just temporary
-   * and we'll reset the values back, we don't need to go through
-   * the full share string/free_string route.
    */
-  skill = op->skill;
+  const shstr skill = op->skill;
+
   if (caster == op)
     op->skill = spell_ob->skill;
   else if (caster->skill)
     op->skill = caster->skill;
   else
-    op->skill = NULL;
+    op->skill = 0;
 
   op->change_skill (find_skill_by_name (op, op->skill));
 
-  for (i = -range; i <= range; i++)
+  unordered_mapwalk (op, -range, -range, range, range)
     {
-      for (j = -range; j <= range; j++)
-        {
-          m = op->map;
-          sx = op->x + i;
-          sy = op->y + j;
-
-          mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
-          if (mflags & P_OUT_OF_MAP)
-            continue;
+      mapspace &ms = m->at (nx, ny);
 
-          if (mflags & P_IS_ALIVE)
+      if (ms.flags () & P_IS_ALIVE)
+        for (object *tmp = ms.bot; tmp; tmp = tmp->above)
+          if (tmp->flag [FLAG_ALIVE] || tmp->is_player ())
             {
-              for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
-                if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
-                  break;
+              tmp = tmp->head_ ();
 
-              if (tmp)
+              if ((friendly && !tmp->flag [FLAG_FRIENDLY] && !tmp->is_player ())
+                  || (!friendly && (tmp->flag [FLAG_FRIENDLY] || tmp->is_player ())))
                 {
-                  if (tmp->head)
-                    tmp = tmp->head;
+                  if (spell_ob->subtype == SP_DESTRUCTION)
+                    {
+                      hit_player (tmp, dam, op, spell_ob->attacktype, 0);
 
-                  if ((friendly && !QUERY_FLAG (tmp, FLAG_FRIENDLY) && tmp->type != PLAYER) ||
-                      (!friendly && (QUERY_FLAG (tmp, FLAG_FRIENDLY) || tmp->type == PLAYER)))
+                      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 (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), sx, sy, 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), sx, sy, op);
-                        }
+                      if (make_object_glow (tmp, 1, dur) && spell_ob->other_arch)
+                        m->insert (arch_to_object (spell_ob->other_arch), nx, ny, op);
                     }
                 }
             }
-        }
     }
 
   op->skill = skill;
@@ -1453,7 +1444,7 @@
    * doing it over and over again.
    */
   god = find_god (determine_god (op));
-  level = caster_level (caster, spell);
+  level = casting_level (caster, spell);
   range = spell->range + SP_level_range_adjust (caster, spell);
 
   /* On the bright side, no monster should ever have a race of GOD_...
@@ -1485,8 +1476,9 @@
           continue;
 
         // players can only affect spaces that they can actually see
-        if (caster && caster->contr
-            && caster->contr->visibility_at (m, nx, ny) < 70)
+        if (caster
+            && caster->contr
+            && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
           continue;
 
         for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
@@ -1606,7 +1598,6 @@
   return 1;
 }
 
-
 /* Move_ball_spell: This handles ball type spells that just sort of wander
  * about.  was called move_ball_lightning, but since more than the ball
  * lightning spell used it, that seemed misnamed.
@@ -1641,7 +1632,6 @@
       /* i bit 0: alters sign of offset
        * other bits (i / 2): absolute value of offset
        */
-
       int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
       int tmpdir = absdir (op->direction + offset);
 
@@ -1653,6 +1643,7 @@
           break;
         }
     }
+
   if (dir == 0)
     {
       nx = op->x;
@@ -1741,7 +1732,7 @@
 
   if (!op->duration || !owner->is_on_map ())
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
 
@@ -1847,7 +1838,7 @@
   object *tmp = archetype::get (SWARM_SPELL);
 
   set_spell_skill (op, caster, spell, tmp);
-  tmp->level      = caster_level (caster, spell);    /* needed later, to get level dep. right. */
+  tmp->level      = casting_level (caster, spell);    /* needed later, to get level dep. right. */
   tmp->spell      = spell->other_arch->instance ();
   tmp->attacktype = tmp->spell->attacktype;
 
@@ -1883,43 +1874,40 @@
 
   dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
 
-  if (!dir)
+  if (dir)
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
-      return 0;
-    }
-
-  x = op->x + freearr_x[dir];
-  y = op->y + freearr_y[dir];
-  m = op->map;
+      x = op->x + freearr_x[dir];
+      y = op->y + freearr_y[dir];
+      m = op->map;
 
-  mflags = get_map_flags (m, &m, x, y, &x, &y);
+      mflags = get_map_flags (m, &m, x, y, &x, &y);
 
-  if (mflags & P_OUT_OF_MAP)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
-      return 0;
-    }
+      if (mflags & P_OUT_OF_MAP)
+        {
+          new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
+          return 0;
+        }
 
-  if (mflags & P_IS_ALIVE && spell->attacktype)
-    {
-      for (target = GET_MAP_OB (m, x, y); target; target = target->above)
-        if (QUERY_FLAG (target, FLAG_MONSTER))
-          {
-            /* oky doky. got a target monster. Lets make a blinding attack */
-            if (target->head)
-              target = target->head;
+      if (mflags & P_IS_ALIVE && spell->attacktype)
+        {
+          for (target = GET_MAP_OB (m, x, y); target; target = target->above)
+            if (QUERY_FLAG (target, FLAG_MONSTER))
+              {
+                /* oky doky. got a target monster. Lets make a blinding attack */
+                if (target->head)
+                  target = target->head;
 
-            hit_player (target, dam, op, spell->attacktype, 1);
-            return 1;           /* one success only! */
-          }
-    }
+                hit_player (target, dam, op, spell->attacktype, 1);
+                return 1;           /* one success only! */
+              }
+        }
 
-  /* no live target, perhaps a wall is in the way? */
-  if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
-      return 0;
+      /* no live target, perhaps a wall is in the way? */
+      if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
+        {
+          new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
+          return 0;
+        }
     }
 
   /* ok, looks groovy to just insert a new light on the map */
@@ -1929,15 +1917,17 @@
       LOG (llevError, "Error: spell arch for cast_light() missing.\n");
       return 0;
     }
+
   tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
+
   if (tmp->glow_radius)
-    {
-      tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
-      if (tmp->glow_radius > MAX_LIGHT_RADII)
-        tmp->glow_radius = MAX_LIGHT_RADII;
-    }
+    tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
+
+  if (dir)
+    m->insert (tmp, x, y, op);
+  else
+    caster->outer_env ()->insert (tmp);
 
-  m->insert (tmp, x, y, op);
   return 1;
 }
 
@@ -2000,7 +1990,7 @@
                 disease->set_owner (op);
                 set_spell_skill (op, caster, spell, disease);
                 disease->stats.exp = 0;
-                disease->level = caster_level (caster, spell);
+                disease->level = casting_level (caster, spell);
 
                 /* do level adjustments */
                 if (disease->stats.wc)