--- deliantra/server/server/spell_attack.C	2007/01/29 16:11:48	1.29
+++ deliantra/server/server/spell_attack.C	2007/04/24 12:32:16	1.32
@@ -165,7 +165,6 @@
 void
 move_bolt (object *op)
 {
-  object *tmp;
   int mflags;
   sint16 x, y;
   maptile *m;
@@ -521,7 +520,7 @@
   if (!(mflags & P_IS_ALIVE))
     return;
 
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
     {
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
@@ -607,9 +606,6 @@
     check_bullet (op);
 }
 
-
-
-
 /* fire_bullet
  * object op (cast from caster) files a bolt in dir.
  * spob is the spell object for the bolt.
@@ -686,16 +682,12 @@
   return 1;
 }
 
-
-
-
 /*****************************************************************************
  *
  * CONE RELATED FUNCTIONS
  *
  *****************************************************************************/
 
-
 /* drops an object based on what is in the cone's "other_arch" */
 void
 cone_drop (object *op)
@@ -1613,9 +1605,7 @@
         if (QUERY_FLAG (spell, FLAG_MONSTER))
           {
             CLEAR_FLAG (head, FLAG_SLEEP);
-            if (QUERY_FLAG (head, FLAG_FRIENDLY))
-              remove_friendly_object (head);
-
+            remove_friendly_object (head);
             done_one = 1;
             head->enemy = op;
           }
@@ -1725,8 +1715,6 @@
    */
   for (j = 0; j < 9; j++)
     {
-      object *new_ob;
-
       hx = nx + freearr_x[j];
       hy = ny + freearr_y[j];
 
@@ -1812,7 +1800,7 @@
   // (a wall 2 cells away will block the effect...) and
   // doesn't work for SP_BULLET anyhow, so again tests the wrong
   // space.
-  // should be fixed later, but correctness before featurs...
+  // should be fixed later, but correctness before features...
   // (schmorp)
 
   /* new offset calculation to make swarm element distribution
@@ -2112,8 +2100,6 @@
 
                 if (infect_object (walk, disease, 1))
                   {
-                    object *flash;      /* visual effect for inflicting disease */
-
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
 
                     disease->destroy ();      /* don't need this one anymore */