OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added parameter to PLayerPawn::GetMaxHealth to return the real maximum health, including stamina upgrades.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-01 00:04:17 +01:00
commit cb295e0441
7 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_mobj.cpp
View file

@ -1330,7 +1330,7 @@ bool P_GiveBody(AActor *actor, int num, int max)
// calls while supporting health pickups.
if (max <= 0)
{
max = static_cast<APlayerPawn*>(actor)->GetMaxHealth() + player->mo->stamina;
max = static_cast<APlayerPawn*>(actor)->GetMaxHealth(true);
// [MH] First step in predictable generic morph effects
if (player->morphTics)
{