--- deliantra/server/server/spell_attack.C	2008/10/06 08:46:33	1.68
+++ deliantra/server/server/spell_attack.C	2008/12/04 01:07:35	1.69
@@ -1252,10 +1252,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)
@@ -1892,43 +1889,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 */
@@ -1938,15 +1932,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;
 }