Fixed serpent staff's alternate attack against shielding centaur

https://forum.zdoom.org/viewtopic.php?t=57305
This commit is contained in:
alexey.lysiuk 2017-07-21 11:17:50 +03:00
parent 714ada01aa
commit b1d1ac13b6

View file

@ -82,7 +82,7 @@ class CWeapStaff : ClericWeapon
{ {
angle = t.angleFromSource; angle = t.angleFromSource;
if (((t.linetarget.player && (!t.linetarget.IsTeammate(self) || level.teamdamage != 0)) || t.linetarget.bIsMonster) if (((t.linetarget.player && (!t.linetarget.IsTeammate(self) || level.teamdamage != 0)) || t.linetarget.bIsMonster)
&& (!t.linetarget.bDormant && !bInvulnerable)) && (!t.linetarget.bDormant && !t.linetarget.bInvulnerable))
{ {
int newLife = player.health + (damage >> 3); int newLife = player.health + (damage >> 3);
newLife = newLife > max ? max : newLife; newLife = newLife > max ? max : newLife;