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

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

Browse source
This commit is contained in:
Mitchell Richters 2023-03-26 09:51:38 +11:00
parent dcfab3e57c
commit 76777a6567
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1615,41 +1615,41 @@ static void doPlayerActionSequence(Player* const pPlayer)
seq_MoveSequence(pPlayerActor, nSeq, pPlayer->nSeqSize);
pPlayer->nSeqSize++;
if (pPlayer->nSeqSize >= SeqSize[nSeq])
if (pPlayer->nSeqSize < SeqSize[nSeq])
return;
pPlayer->nSeqSize = 0;
switch (pPlayer->nAction)
{
pPlayer->nSeqSize = 0;
default:
break;
case 3:
pPlayer->nSeqSize = SeqSize[nSeq] - 1;
break;
case 4:
pPlayer->nAction = 0;
break;
case 16:
pPlayer->nSeqSize = SeqSize[nSeq] - 1;
switch (pPlayer->nAction)
if (pPlayerActor->spr.pos.Z < pPlayerActor->sector()->floorz)
pPlayerActor->spr.pos.Z++;
if (!RandomSize(5))
{
default:
break;
case 3:
pPlayer->nSeqSize = SeqSize[nSeq] - 1;
break;
case 4:
pPlayer->nAction = 0;
break;
case 16:
pPlayer->nSeqSize = SeqSize[nSeq] - 1;
if (pPlayerActor->spr.pos.Z < pPlayerActor->sector()->floorz)
pPlayerActor->spr.pos.Z++;
if (!RandomSize(5))
{
sectortype* mouthSect;
const auto pos = WheresMyMouth(pPlayer->nPlayer, &mouthSect);
BuildAnim(nullptr, 71, 0, DVector3(pos.XY(), pPlayerActor->spr.pos.Z + 15), mouthSect, 1.171875, 128);
}
break;
case 17:
pPlayer->nAction = 18;
break;
case 19:
pPlayerActor->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
pPlayer->nAction = 20;
break;
sectortype* mouthSect;
const auto pos = WheresMyMouth(pPlayer->nPlayer, &mouthSect);
BuildAnim(nullptr, 71, 0, DVector3(pos.XY(), pPlayerActor->spr.pos.Z + 15), mouthSect, 1.171875, 128);
}
break;
case 17:
pPlayer->nAction = 18;
break;
case 19:
pPlayerActor->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
pPlayer->nAction = 20;
break;
}
}