--- deliantra/server/server/spell_attack.C	2007/01/29 16:11:48	1.29
+++ deliantra/server/server/spell_attack.C	2007/05/17 20:27:02	1.35
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
@@ -147,7 +147,7 @@
   new_bolt->stats.Dex -= 10;
   tmp->stats.Dex -= 10;         /* less forks from main bolt too */
   new_bolt->stats.Con += 25 * new_dir;  /* adjust the left bias */
-  new_bolt->speed_left = -0.1;
+  new_bolt->speed_left = -0.1f;
   new_bolt->direction = t_dir;
   new_bolt->duration++;
   new_bolt->stats.dam /= 2;     /* reduce daughter bolt damage */
@@ -165,7 +165,6 @@
 void
 move_bolt (object *op)
 {
-  object *tmp;
   int mflags;
   sint16 x, y;
   maptile *m;
@@ -248,7 +247,7 @@
           object *tmp = op->clone ();
 
           m->insert (tmp, x, y, op);
-          tmp->speed_left = -0.1;
+          tmp->speed_left = -0.1f;
           /* To make up for the decrease at the top of the function */
           tmp->duration++;
 
@@ -383,7 +382,7 @@
               object *tmp = op->clone ();
 
               tmp->state = 0;
-              tmp->speed_left = -0.21;
+              tmp->speed_left = -0.21f;
               tmp->range--;
               tmp->value = 0;
 
@@ -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)
@@ -1310,9 +1302,6 @@
   return 1;
 }
 
-
-
-
 int
 cast_destruction (object *op, object *caster, object *spell_ob)
 {
@@ -1342,7 +1331,7 @@
   else
     op->skill = NULL;
 
-  change_skill (op, find_skill_by_name (op, op->skill), 1);
+  op->change_skill (find_skill_by_name (op, op->skill));
 
   for (i = -range; i < range; i++)
     {
@@ -1456,8 +1445,8 @@
       return 1;
     }
   force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
-  force->speed = 1.0;
-  force->speed_left = -1.0;
+  force->speed = 1.f;
+  force->speed_left = -1.f;
   SET_FLAG (force, FLAG_APPLIED);
 
   if (god)
@@ -1613,9 +1602,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 +1712,6 @@
    */
   for (j = 0; j < 9; j++)
     {
-      object *new_ob;
-
       hx = nx + freearr_x[j];
       hy = ny + freearr_y[j];
 
@@ -1812,7 +1797,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 +2097,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 */