ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/attack.C
(Generate patch)

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.77 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.78 by root, Mon Oct 22 03:11:46 2007 UTC

703 *simple_attack = 1; 703 *simple_attack = 1;
704 return 0; 704 return 0;
705 } 705 }
706 706
707 if (QUERY_FLAG (*target, FLAG_REMOVED) 707 if (QUERY_FLAG (*target, FLAG_REMOVED)
708 || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) 708 || QUERY_FLAG (*hitter, FLAG_REMOVED)
709 || !(*hitter)->map
710 || !on_same_map (*hitter, *target))
709 { 711 {
710 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n", 712 LOG (llevError | logBacktrace, "BUG: hitter (%s) with no relation to target (%s)\n",
711 (*hitter)->debug_desc (), (*target)->debug_desc ()); 713 (*hitter)->debug_desc (), (*target)->debug_desc ());
712 return 1; 714 return 1;
713 } 715 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines