zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-20 18:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Move doPlayerMask() into doPlayerCounters().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 09:42:37 +11:00
parent 1ebc634ac0
commit 47d25932d5
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/games/exhumed/src/player.cpp
View file

@ -814,6 +814,16 @@ static void doPlayerCounters(Player* const pPlayer)
}
}
if (pPlayer->nMaskAmount > 0 && pPlayer->nHealth > 0)
{
pPlayer->nMaskAmount--;
if (pPlayer->nMaskAmount == 150 && pPlayer->nPlayer == nLocalPlayer)
{
PlayAlert(GStrings("TXT_EX_MASKEX"));
}
}
if (pPlayer->nQuake != 0)
{
pPlayer->nQuake = -pPlayer->nQuake;
@ -836,22 +846,6 @@ static void doPlayerCounters(Player* const pPlayer)
//
//---------------------------------------------------------------------------
static void doPlayerMask(Player* const pPlayer)
{
pPlayer->nMaskAmount--;
if (pPlayer->nMaskAmount == 150 && pPlayer->nPlayer == nLocalPlayer)
{
PlayAlert(GStrings("TXT_EX_MASKEX"));
}
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void doPlayerBreath(Player* const pPlayer)
{
const auto pPlayerActor = pPlayer->pActor;
@ -1550,9 +1544,6 @@ void AIPlayer::Tick(RunListEvent* ev)
if (pPlayer->nHealth > 0)
{
if (pPlayer->nMaskAmount > 0)
doPlayerMask(pPlayer);
if (!pPlayer->invincibility)
doPlayerBreath(pPlayer);