[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.84 by root, Tue Jul 8 08:33:27 2008 UTC vs.
Revision 1.85 by root, Sun Aug 17 22:46:26 2008 UTC

  */
 int
 cast_bless (object *op, object *caster, object *spell_ob, int dir)
 {
   int i;
-  object *god = find_god (determine_god (op)), *tmp2, *force = NULL, *tmp;
+  object *god = find_god (determine_god (op)), *force = NULL, *tmp;
   /* if dir = 99 op defaults to tmp, eat_special_food() requires this. */
   if (dir != 0)
     {
       tmp = find_target_for_friendly_spell (op, dir);
+      if (!tmp)
+        return 0;
     }
   else
-    {
-      tmp = op;
+    tmp = op;
-    }
   /* If we've already got a force of this type, don't add a new one. */
-  for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
+  for (object *tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
     {
       if (tmp2->type == FORCE && tmp2->subtype == FORCE_CHANGE_ABILITY)
         {
           if (tmp2->name == spell_ob->name)
             {
               new_draw_info_format (NDI_UNIQUE, 0, op, "You can not cast %s while %s is in effect", &spell_ob->name, &tmp2->name_pl);
               return 0;
             }
         }
     }
   if (force == NULL)
     {
       force = get_archetype (FORCE_NAME);
       force->subtype = FORCE_CHANGE_ABILITY;
       if (spell_ob->race)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines