zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Not all paths in A_CStaffCheck did proper checks on the player's health.

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-28 15:14:05 +01:00
parent 94f37bde30
commit c390b98966
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/g_hexen/a_clericstaff.cpp
View file

@ -112,7 +112,10 @@ DEFINE_ACTION_FUNCTION(AActor, A_CStaffCheck)
{
newLife = player->health + (damage >> 4);
newLife = newLife > max ? max : newLife;
pmo->health = player->health = newLife;
if (newLife > player->health)
{
pmo->health = player->health = newLife;
}
P_SetPsprite(player, ps_weapon, weapon->FindState("Drain"));
}
if (weapon != NULL)