--- deliantra/server/server/spell_attack.C	2009/09/10 14:57:36	1.86
+++ deliantra/server/server/spell_attack.C	2009/10/12 04:02:17	1.87
@@ -547,10 +547,6 @@
 void
 move_bullet (object *op)
 {
-  sint16 new_x, new_y;
-  int mflags;
-  maptile *m;
-
 #if 0
   /* We need a better general purpose way to do this */
 
@@ -575,18 +571,20 @@
       return;
     }
 
-  new_x = op->x + DIRX (op);
-  new_y = op->y + DIRY (op);
-  m = op->map;
-  mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
+  mapxy pos (op);
+  pos.move (op->direction);
 
-  if (mflags & P_OUT_OF_MAP)
+  if (!pos.normalise ())
     {
       op->destroy ();
       return;
     }
 
-  if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
+  mapspace &ms = pos.ms ();
+
+  ms.update ();
+
+  if (!op->direction || OB_TYPE_MOVE_BLOCK (op, ms.move_block))
     {
       if (op->other_arch)
         explode_bullet (op);
@@ -596,7 +594,7 @@
       return;
     }
 
-  if (!(op = m->insert (op, new_x, new_y, op)))
+  if (!(op = pos.insert (op, op)))
     return;
 
   if (reflwall (op->map, op->x, op->y, op))