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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.92 by root, Wed Dec 24 01:37:24 2008 UTC vs.
Revision 1.93 by root, Wed Dec 31 17:35:38 2008 UTC

   if (!weapon)
     {
       new_draw_info (NDI_BLACK, 0, op, "You must mark a weapon to use with this spell!");
       return 0;
     }
-  if (spell->race && strcmp (weapon->arch->archname, spell->race))
+  if (spell->race && weapon->arch->archname != spell->race)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to transform your weapon.");
       return 0;
     }
   if (weapon->type != WEAPON)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You need to wield a weapon to animate it.");
       return 0;
     }
   if (QUERY_FLAG (weapon, FLAG_APPLIED))
     {
       new_draw_info_format (NDI_BLACK, 0, op, "You need to unequip %s before using it in this spell", query_name (weapon));
       return 0;
     }
  * op is the piece object.
  */
 void
 move_peacemaker (object *op)
 {
-  object *tmp;
+  for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
-  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       int atk_lev, def_lev;
       object *victim = tmp->head_ ();
       if (!QUERY_FLAG (victim, FLAG_MONSTER))
             new_draw_info_format (NDI_UNIQUE, 0, op->owner, "%s no longer feels like fighting.", &victim->name);
         }
     }
 }
 /* This writes a rune that contains the appropriate message.
  * There really isn't any adjustments we make.
  */
 int
 write_mark (object *op, object *spell, const char *msg)
 {
   char rune[HUGE_BUF];
   object *tmp;

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