- Added a separate cheat flag to handle buddha powerups. Currently, Buddha powerups could interfere and disable the actual player cheat unintentionally, when the player may not want their actual cheat to be turned off.

- Set some overlooked 1000000 damage points to TELEFRAG_DAMAGE inside the falling damage code.
This commit is contained in:
Major Cooke 2017-05-14 09:59:43 -05:00 committed by Christoph Oelckers
commit 795f8f0578
6 changed files with 10 additions and 8 deletions

View file

@ -2105,7 +2105,7 @@ void P_FallingDamage (AActor *actor)
}
if (vel >= 63)
{ // automatic death
damage = 1000000;
damage = TELEFRAG_DAMAGE;
}
else
{
@ -2126,7 +2126,7 @@ void P_FallingDamage (AActor *actor)
}
if (vel >= 84)
{ // automatic death
damage = 1000000;
damage = TELEFRAG_DAMAGE;
}
else
{
@ -2156,7 +2156,7 @@ void P_FallingDamage (AActor *actor)
{
S_Sound (actor, CHAN_AUTO, "*land", 1, ATTN_NORM);
P_NoiseAlert (actor, actor, true);
if (damage == 1000000 && (actor->player->cheats & (CF_GODMODE | CF_BUDDHA)))
if (damage >= TELEFRAG_DAMAGE && (actor->player->cheats & (CF_GODMODE | CF_BUDDHA | CF_POWERBUDDHA )))
{
damage = 999;
}