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.103 by root, Sun Dec 28 08:56:44 2008 UTC vs.
Revision 1.104 by root, Wed Dec 31 17:35:37 2008 UTC

… …
1773 1773
1774 if ((!hitter->slaying || 1774 if ((!hitter->slaying ||
1775 (!(op->race && strstr (hitter->slaying, op->race)) && 1775 (!(op->race && strstr (hitter->slaying, op->race)) &&
1776 !(op->name && strstr (hitter->slaying, op->name)))) && 1776 !(op->name && strstr (hitter->slaying, op->name)))) &&
1777 (!QUERY_FLAG (op, FLAG_UNDEAD) || 1777 (!QUERY_FLAG (op, FLAG_UNDEAD) ||
1778 (hitter->title != NULL 1778 (hitter->title
1779 && (god = find_god (determine_god (hitter))) != NULL && god->race != NULL && strstr (god->race, shstr_undead) != NULL))) 1779 && (god = find_god (determine_god (hitter))) != NULL && god->race && strstr (god->race, shstr_undead))))
1780 return 0; 1780 return 0;
1781 } 1781 }
1782 1782
1783 maxattacktype = type; /* initialise this to something */ 1783 maxattacktype = type; /* initialise this to something */
1784 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum) 1784 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++, attacktype = 1 << attacknum)

Diff Legend

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