--- deliantra/server/server/spell_attack.C	2006/12/22 16:34:00	1.22
+++ deliantra/server/server/spell_attack.C	2006/12/25 11:25:50	1.23
@@ -282,7 +282,6 @@
  * This function sets up the appropriate owner and skill
  * pointers.
  */
-
 int
 fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
 {
@@ -317,13 +316,16 @@
   tmp->y = op->y + DIRY (tmp);
   tmp->map = op->map;
 
-  mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
+  maptile *newmap;
+  mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
       tmp->destroy ();
       return 0;
     }
 
+  tmp->map = newmap;
+
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
@@ -555,13 +557,11 @@
     }
 }
 
-
 /* Basically, we move 'op' one square, and if it hits something,
  * call check_bullet.
  * This function is only applicable to bullets, but not to all
  * fired arches (eg, bolts).
  */
-
 void
 move_bullet (object *op)
 {
@@ -626,9 +626,7 @@
       update_turn_face (op);
     }
   else
-    {
-      check_bullet (op);
-    }
+    check_bullet (op);
 }
 
 
@@ -680,13 +678,16 @@
   tmp->y = op->y + freearr_y[dir];
   tmp->map = op->map;
 
-  mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
+  maptile *newmap;
+  mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
       tmp->destroy ();
       return 0;
     }
 
+  tmp->map = newmap;
+
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
@@ -701,7 +702,7 @@
       tmp->map = op->map;
     }
 
-  if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
+  if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)))
     check_bullet (tmp);
 
   return 1;