zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-19 15:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Change doPlayerDeathRestart() to do an early return instead of nested branches.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-26 09:56:55 +11:00
parent b6c3753d3a
commit dcfab3e57c
1 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1565,40 +1565,37 @@ static void doPlayerAngles(Player* const pPlayer)
static bool doPlayerDeathRestart(Player* const pPlayer)
{
if (pPlayer->input.actions & SB_OPEN)
if (!(pPlayer->input.actions & SB_OPEN) || pPlayer->nAction < 16)
return true;
pPlayer->input.actions &= ~SB_OPEN;
if (pPlayer->nPlayer == nLocalPlayer)
{
pPlayer->input.actions &= ~SB_OPEN;
StopAllSounds();
StopLocalSound();
GrabPalette();
}
if (pPlayer->nAction >= 16)
pPlayer->nCurrentWeapon = pPlayer->nPlayerOldWeapon;
if (pPlayer->nLives && nNetTime)
{
if (pPlayer->nAction != 20)
{
if (pPlayer->nPlayer == nLocalPlayer)
{
StopAllSounds();
StopLocalSound();
GrabPalette();
}
pPlayer->nCurrentWeapon = pPlayer->nPlayerOldWeapon;
if (pPlayer->nLives && nNetTime)
{
if (pPlayer->nAction != 20)
{
const auto pPlayerActor = pPlayer->pActor;
pPlayerActor->spr.picnum = seq_GetSeqPicnum(kSeqJoe, 120, 0);
pPlayerActor->spr.cstat = 0;
pPlayerActor->spr.pos.Z = pPlayerActor->sector()->floorz;
}
// will invalidate nPlayerSprite
RestartPlayer(pPlayer->nPlayer);
}
else
{
DoGameOverScene(currentLevel->levelNumber == 20);
return false;
}
const auto pPlayerActor = pPlayer->pActor;
pPlayerActor->spr.picnum = seq_GetSeqPicnum(kSeqJoe, 120, 0);
pPlayerActor->spr.cstat = 0;
pPlayerActor->spr.pos.Z = pPlayerActor->sector()->floorz;
}
// will invalidate nPlayerSprite
RestartPlayer(pPlayer->nPlayer);
}
else
{
DoGameOverScene(currentLevel->levelNumber == 20);
return false;
}
return true;