--- deliantra/server/server/spell_attack.C	2008/05/17 14:11:13	1.57
+++ deliantra/server/server/spell_attack.C	2008/05/17 14:57:23	1.58
@@ -41,7 +41,6 @@
 void
 check_spell_knockback (object *op)
 {
-  object *tmp, *tmp2;           /* object on the map */
   int weight_move;
   int frictionmod = 2;          /*poor man's physics - multipy targets weight by this amount */
 
@@ -56,7 +55,7 @@
       /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
     }
 
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
     {
       int num_sections = 1;
 
@@ -73,7 +72,7 @@
         continue;
 
       /* count the object's sections */
-      for (tmp2 = tmp; tmp2 != NULL; tmp2 = tmp2->more)
+      for (object *tmp2 = tmp; tmp2; tmp2 = tmp2->more)
         num_sections++;
 
       /* I'm not sure if it makes sense to divide by num_sections - bigger
@@ -158,7 +157,6 @@
 /* move_bolt: moves bolt 'op'.  Basically, it just advances a space,
  * and checks for various things that may stop it.
  */
-
 void
 move_bolt (object *op)
 {
@@ -251,10 +249,8 @@
           /* New forking code.  Possibly create forks of this object
            * going off in other directions. 
            */
-          if (rndm (0, 99) < tmp->stats.Dex)
-            {                   /* stats.Dex % of forking */
-              forklightning (op, tmp);
-            }
+          if (tmp->stats.Dex && rndm (0, 99) < tmp->stats.Dex)
+            forklightning (op, tmp); /* stats.Dex % of forking */
 
           /* In this way, the object left behind sticks on the space, but
            * doesn't create any bolts that continue to move onward.
@@ -288,8 +284,10 @@
   /*  peterm:  level dependency for bolts  */
   tmp->stats.dam = spob->stats.dam + SP_level_dam_adjust (caster, spob);
   tmp->attacktype = spob->attacktype;
+
   if (spob->slaying)
     tmp->slaying = spob->slaying;
+
   tmp->range = spob->range + SP_level_range_adjust (caster, spob);
   tmp->duration = spob->duration + SP_level_duration_adjust (caster, spob);
   tmp->stats.Dex = spob->stats.Dex;
@@ -435,6 +433,7 @@
   if (op->attacktype)
     {
       hit_map (op, 0, op->attacktype, 1);
+
       if (op->destroyed ())
         return;
     }
@@ -522,6 +521,7 @@
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
           dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
+
           if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
             {
               if (!QUERY_FLAG (op, FLAG_REMOVED))
@@ -705,8 +705,6 @@
 void
 move_cone (object *op)
 {
-  int i;
-
   /* if no map then hit_map will crash so just ignore object */
   if (!op->map)
     {
@@ -761,7 +759,7 @@
       return;
     }
 
-  for (i = -1; i < 2; i++)
+  for (int i = -1; i <= 1; i++)
     {
       sint16 x = op->x + freearr_x[absdir (op->stats.sp + i)], y = op->y + freearr_y[absdir (op->stats.sp + i)];
 
@@ -1180,62 +1178,47 @@
 void
 move_missile (object *op)
 {
-  int i, mflags;
-  object *owner;
-  sint16 new_x, new_y;
-  maptile *m;
-
   if (op->range-- <= 0)
     {
       op->destroy ();
       return;
     }
 
-  owner = op->owner;
-#if 0
-  /* It'd make things nastier if this wasn't here - spells cast by
-   * monster that are then killed would continue to survive
-   */
-  if (owner == NULL)
+  mapxy pos (op);
+  pos.move (op->direction);
+  
+  if (!pos.normalise ())
     {
       op->destroy ();
       return;
     }
-#endif
 
-  new_x = op->x + DIRX (op);
-  new_y = op->y + DIRY (op);
+  mapspace &ms = pos.ms ();
 
-  mflags = get_map_flags (op->map, &m, new_x, new_y, &new_x, &new_y);
-
-  if (!(mflags & P_OUT_OF_MAP) && ((mflags & P_IS_ALIVE) || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y))))
+  if (ms.flags () & P_IS_ALIVE || ms.blocks (op))
     {
       hit_map (op, op->direction, AT_MAGIC, 1);
       /* Basically, missile only hits one thing then goes away.
        * we need to remove it if someone hasn't already done so.
        */
-      if (!op->destroyed ())
-        op->destroy ();
-
+      op->destroy ();
       return;
     }
 
-  op->remove ();
-
-  if (!op->direction || (mflags & P_OUT_OF_MAP))
+  if (!op->direction)
     {
       op->destroy ();
       return;
     }
 
-  i = spell_find_dir (m, new_x, new_y, op->owner);
+  int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
   if (i > 0 && i != op->direction)
     {
       op->direction = i;
       SET_ANIMATION (op, op->direction);
     }
 
-  m->insert (op, new_x, new_y, op);
+  pos.insert (op, op);
 }
 
 /****************************************************************************
@@ -1302,9 +1285,9 @@
 
   op->change_skill (find_skill_by_name (op, op->skill));
 
-  for (i = -range; i < range; i++)
+  for (i = -range; i <= range; i++)
     {
-      for (j = -range; j < range; j++)
+      for (j = -range; j <= range; j++)
         {
           m = op->map;
           sx = op->x + i;
@@ -1331,6 +1314,7 @@
                       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);
                         }
@@ -1704,8 +1688,8 @@
         {
           if (j)
             op->stats.dam = dam_save / 2;
-          hit_map (op, j, op->attacktype, 1);
 
+          hit_map (op, j, op->attacktype, 1);
         }
 
       /* insert the other arch */
@@ -1913,7 +1897,8 @@
             /* oky doky. got a target monster. Lets make a blinding attack */
             if (target->head)
               target = target->head;
-            (void) hit_player (target, dam, op, spell->attacktype, 1);
+
+            hit_player (target, dam, op, spell->attacktype, 1);
             return 1;           /* one success only! */
           }
     }