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

fix max health for Doom's health bonus with Dehacked modifications present.

Browse source
This commit is contained in:
Christoph Oelckers 2023-12-20 00:11:09 +01:00
parent a31cfa97e4
commit 3f05f38a60
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gamedata/d_dehacked.cpp
View file

@ -2545,7 +2545,7 @@ static int PatchMisc (int dummy)
auto health = GetDefaultByName ("HealthBonus");
if (health!=NULL)
{
health->IntVar(NAME_MaxAmount) = 2 * deh.MaxHealth;
health->IntVar(NAME_MaxAmount) = -1; // needs to be evaluated at run time due to the compat flag.
}
health = GetDefaultByName ("Soulsphere");

27
wadsrc/static/zscript/actors/doom/doomhealth.zs
View file

@ -16,6 +16,33 @@ class HealthBonus : Health
BON1 ABCDCB 6;
Loop;
}
//===========================================================================
//
// TryPickup
//
//===========================================================================
override bool TryPickup (in out Actor other)
{
PrevHealth = other.player != NULL ? other.player.health : other.health;
// Dehacked max health is compatibility dependent because Boom interpreted this value wrong.
let maxamt = MaxAmount;
if (maxamt < 0)
{
maxamt = deh.MaxHealth;
if (!(Level.compatflags & COMPATF_DEHHEALTH)) maxamt *= 2;
}
if (other.GiveBody(Amount, maxamt))
{
GoAwayAndDie();
return true;
}
return false;
}
}
// Stimpack -----------------------------------------------------------------