--- deliantra/server/server/spell_attack.C	2007/08/01 00:52:38	1.46
+++ deliantra/server/server/spell_attack.C	2007/08/15 18:06:32	1.47
@@ -1375,8 +1375,10 @@
       return 0;
     }
 
+  tmp = tmp->head_ ();
+
   /* If we've already got a force of this type, don't add a new one. */
-  for (force = tmp->inv; force != NULL; force = force->below)
+  for (force = tmp->inv; force; force = force->below)
     {
       if (force->type == FORCE && force->subtype == FORCE_CHANGE_ABILITY)
         {
@@ -1392,10 +1394,11 @@
         }
     }
 
-  if (force == NULL)
+  if (!force)
     {
       force = get_archetype (FORCE_NAME);
       force->subtype = FORCE_CHANGE_ABILITY;
+
       if (spell_ob->race)
         force->name = spell_ob->race;
       else
@@ -1415,11 +1418,11 @@
           new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
         }
       else
-        {
-          new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
-        }
+        new_draw_info (NDI_UNIQUE, 0, op, "Recasting the spell had no effect.");
+
       return 1;
     }
+
   force->duration = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob) * 50;
   force->speed = 1.f;
   force->speed_left = -1.f;