zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-20 14:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Might as well split out the death restart as well.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 16:06:19 +11:00
parent 7da9b2c17d
commit 7ecf6b26c3
1 changed files with 51 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1668,6 +1668,53 @@ static void doPlayerPitch(Player* const pPlayer)
//
//---------------------------------------------------------------------------
static bool doPlayerDeathRestart(Player* const pPlayer)
{
if (pPlayer->input.actions & SB_OPEN)
{
pPlayer->input.actions &= ~SB_OPEN;
if (pPlayer->nAction >= 16)
{
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;
}
}
}
return true;
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
static void doPlayerActionSequence(Player* const pPlayer)
{
const auto pPlayerActor = pPlayer->pActor;
@ -1800,53 +1847,19 @@ void AIPlayer::Tick(RunListEvent* ev)
doPlayerPitch(pPlayer);
doPlayerYaw(pPlayer);
}
else // else, player's health is less than 0
else
{
setForcedSyncInput(nPlayer);
doPlayerDeathPitch(pPlayer);
if (pPlayer->input.actions & SB_OPEN)
if (!doPlayerDeathRestart(pPlayer))
{
pPlayer->input.actions &= ~SB_OPEN;
if (pPlayer->nAction >= 16)
{
if (nPlayer == nLocalPlayer)
{
StopAllSounds();
StopLocalSound();
GrabPalette();
}
pPlayer->nCurrentWeapon = pPlayer->nPlayerOldWeapon;
if (pPlayer->nLives && nNetTime)
{
if (pPlayer->nAction != 20)
{
pPlayerActor->spr.picnum = seq_GetSeqPicnum(kSeqJoe, 120, 0);
pPlayerActor->spr.cstat = 0;
pPlayerActor->spr.pos.Z = pPlayerActor->sector()->floorz;
}
// will invalidate nPlayerSprite
RestartPlayer(nPlayer);
}
else
{
DoGameOverScene(currentLevel->levelNumber == 20);
return;
}
}
return;
}
}
doPlayerActionSequence(pPlayer);
if (!pPlayer->nHealth)
doPlayerDeathPitch(pPlayer);
updatePlayerDoppleActor(pPlayer);
MoveWeapons(nPlayer);
}