--- deliantra/server/server/spell_attack.C	2008/12/28 08:08:25	1.75
+++ deliantra/server/server/spell_attack.C	2009/03/02 11:45:19	1.83
@@ -830,18 +830,14 @@
 
   for (i = range_min; i <= range_max; i++)
     {
-      sint16 x, y, d;
+      sint16 x, y;
 
       /* We can't use absdir here, because it never returns
-       * 0.  If this is a rune, we want to hit the person on top
+       * 0. If this is a rune, we want to hit the person on top
        * of the trap (d==0).  If it is not a rune, then we don't want
        * to hit that person.
        */
-      d = dir + i;
-      while (d < 0)
-        d += 8;
-      while (d > 8)
-        d -= 8;
+      int d = dir ? absdir (dir + i) : i;
 
       /* If it's not a rune, we don't want to blast the caster.
        * In that case, we have to see - if dir is specified,
@@ -1117,9 +1113,11 @@
    * can't be friendly to your god.
    */
 
-  if (!target || QUERY_FLAG (target, FLAG_REFL_SPELL)
+  if (!target
+      || target->flag [FLAG_REFL_SPELL]
       || (!god && spell->stats.grace)
-      || (target->title && god && !strcmp (target->title, god->name)) || (target->race && god && strstr (target->race, god->race)))
+      || (god && target->title == god->name)
+      || (god && target->race.contains (god->race)))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Your request is unheeded.");
       return 0;
@@ -1136,7 +1134,7 @@
   if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
     {
       if (tailor_god_spell (effect, op))
-        new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));
+        new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", (const char *)determine_god (op));
       else
         {
           new_draw_info (NDI_UNIQUE, 0, op, "Your request is ignored.");
@@ -1260,11 +1258,11 @@
   tmp->speed = 0.01;
   tmp->stats.food = time;
   SET_FLAG (tmp, FLAG_IS_USED_UP);
-  tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
+  tmp->set_glow_radius (min (MAX_LIGHT_RADIUS, radius));
   tmp = insert_ob_in_ob (tmp, op);
 
   if (tmp->glow_radius > op->glow_radius)
-    op->glow_radius = tmp->glow_radius;
+    op->set_glow_radius (tmp->glow_radius);
 
   return 1;
 }
@@ -1451,9 +1449,9 @@
    */
   if (!spell->race)
     race = NULL;
-  else if (god && !strcmp (spell->race, "GOD_SLAYING"))
+  else if (god && spell->race == shstr_GOD_SLAYING)
     race = god->slaying;
-  else if (god && !strcmp (spell->race, "GOD_FRIEND"))
+  else if (god && spell->race == shstr_GOD_FRIEND)
     race = god->race;
   else
     race = spell->race;
@@ -1911,7 +1909,8 @@
   tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
 
   if (tmp->glow_radius)
-    tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
+    tmp->set_glow_radius (
+      min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell)));
 
   if (dir)
     m->insert (tmp, x, y, op);