--- deliantra/server/server/spell_attack.C	2007/03/30 21:53:09	1.31
+++ deliantra/server/server/spell_attack.C	2007/05/18 13:15:29	1.36
@@ -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 */
@@ -247,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++;
 
@@ -382,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;
 
@@ -1302,9 +1302,6 @@
   return 1;
 }
 
-
-
-
 int
 cast_destruction (object *op, object *caster, object *spell_ob)
 {
@@ -1334,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++)
     {
@@ -1448,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)
@@ -1579,21 +1576,22 @@
               continue;
           }
         else                    /* spell->attacktype */
-          /*
-             Spell has no attacktype (charm & such), so we'll have a specific saving:
-             * if spell level < monster level, no go
-             * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
+          {
+            /*
+               Spell has no attacktype (charm & such), so we'll have a specific saving:
+               * if spell level < monster level, no go
+               * else, chance of effect = 20 + min( 50, 2 * ( spell level - monster level ) )
 
-             The chance will then be in the range [20-70] percent, not too bad.
+               The chance will then be in the range [20-70] percent, not too bad.
 
-             This is required to fix the 'charm monster' abuse, where a player level 1 can
-             charm a level 125 monster...
+               This is required to fix the 'charm monster' abuse, where a player level 1 can
+               charm a level 125 monster...
 
-             Ryo, august 14th
-           */
-          {
+               Ryo, august 14th
+            */
             if (head->level > level)
               continue;
+
             if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
               /* Failed, no effect */
               continue;
@@ -1605,9 +1603,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;
           }