--- deliantra/server/server/spell_attack.C	2009/09/10 14:57:36	1.86
+++ deliantra/server/server/spell_attack.C	2009/10/12 14:00:59	1.88
@@ -5,18 +5,19 @@
  * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -547,10 +548,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 +572,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 +595,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))