zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 20:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Tidy up StartDeathSeq().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-29 19:41:05 +11:00
parent 3e4dd94fe5
commit 86711f666b
1 changed files with 27 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -356,18 +356,20 @@ int GrabPlayer()
void StartDeathSeq(int nPlayer, int nVal) void StartDeathSeq(int nPlayer, int nVal)
{ {
const auto pPlayer = &PlayerList[nPlayer];
const auto pPlayerActor = pPlayer->pActor;
const auto pPlayerSect = pPlayerActor->sector();
FreeRa(nPlayer); FreeRa(nPlayer);
auto pActor = PlayerList[nPlayer].pActor; pPlayer->nHealth = 0;
PlayerList[nPlayer].nHealth = 0;
int nLotag = pActor->sector()->lotag; if (pPlayerSect->lotag > 0)
{
if (nLotag > 0) { runlist_SignalRun(pPlayerSect->lotag - 1, nPlayer, &ExhumedAI::EnterSector);
runlist_SignalRun(nLotag - 1, nPlayer, &ExhumedAI::EnterSector);
} }
if (PlayerList[nPlayer].pPlayerGrenade) if (pPlayer->pPlayerGrenade)
{ {
ThrowGrenade(nPlayer, 0, -10000); ThrowGrenade(nPlayer, 0, -10000);
} }
@ -375,75 +377,43 @@ void StartDeathSeq(int nPlayer, int nVal)
{ {
if (nNetPlayerCount) if (nNetPlayerCount)
{ {
int nWeapon = PlayerList[nPlayer].nCurrentWeapon; const int nWeapon = pPlayer->nCurrentWeapon;
if (nWeapon > kWeaponSword && nWeapon <= kWeaponRing) if (nWeapon > kWeaponSword && nWeapon <= kWeaponRing)
{ {
auto pSector = pActor->sector(); const auto pSector = pPlayerSect->pBelow ? pPlayerSect->pBelow : pPlayerSect;
if (pSector->pBelow != nullptr) { const auto pGunActor = GrabBodyGunSprite();
pSector = pSector->pBelow;
}
auto pGunActor = GrabBodyGunSprite();
ChangeActorSect(pGunActor, pSector); ChangeActorSect(pGunActor, pSector);
pGunActor->spr.pos = { pActor->spr.pos.X, pActor->spr.pos.Y, pSector->floorz - 2 };
ChangeActorStat(pGunActor, nGunLotag[nWeapon] + 900); ChangeActorStat(pGunActor, nGunLotag[nWeapon] + 900);
pGunActor->spr.pos = DVector3(pPlayerActor->spr.pos.XY(), pSector->floorz - 2);
pGunActor->spr.picnum = nGunPicnum[nWeapon]; pGunActor->spr.picnum = nGunPicnum[nWeapon];
BuildItemAnim(pGunActor); BuildItemAnim(pGunActor);
} }
} }
} }
PlayerList[nPlayer].bIsFiring = false; pPlayer->bIsFiring = false;
pPlayer->nInvisible = 0;
PlayerList[nPlayer].pActor->PrevAngles.Pitch = PlayerList[nPlayer].pActor->spr.Angles.Pitch = nullAngle; pPlayer->dVertPan = 15;
pActor->oviewzoffset = pActor->viewzoffset = -55; pPlayer->nDeathType = pPlayerSect->Damage <= 0 ? nVal : 2;
PlayerList[nPlayer].nInvisible = 0; pPlayer->ototalvel = pPlayer->totalvel = 0;
PlayerList[nPlayer].dVertPan = 15; pPlayer->nSeqSize = 0;
pPlayer->nAction = (nVal || !(pPlayerSect->Flag & kSectUnderwater)) ? ((nVal * 2) + 17) : 16;
pActor->spr.cstat &= ~CSTAT_SPRITE_INVISIBLE; pPlayerActor->PrevAngles.Pitch = pPlayerActor->spr.Angles.Pitch = nullAngle;
pPlayerActor->oviewzoffset = pPlayerActor->viewzoffset = -55;
pPlayerActor->spr.cstat &= ~(CSTAT_SPRITE_INVISIBLE|CSTAT_SPRITE_BLOCK_ALL);
SetNewWeaponImmediate(nPlayer, -2); SetNewWeaponImmediate(nPlayer, -2);
if (pActor->sector()->Damage <= 0)
{
PlayerList[nPlayer].nDeathType = nVal;
}
else
{
PlayerList[nPlayer].nDeathType = 2;
}
nVal *= 2;
if (nVal || !(pActor->sector()->Flag & kSectUnderwater))
{
PlayerList[nPlayer].nAction = nVal + 17;
}
else {
PlayerList[nPlayer].nAction = 16;
}
PlayerList[nPlayer].nSeqSize = 0;
pActor->spr.cstat &= ~CSTAT_SPRITE_BLOCK_ALL;
if (nTotalPlayers == 1) if (nTotalPlayers == 1)
{ {
if (!(currentLevel->gameflags & LEVEL_EX_TRAINING)) { // if not on the training level if (!(currentLevel->gameflags & LEVEL_EX_TRAINING))
PlayerList[nPlayer].nLives--; pPlayer->nLives--;
}
if (PlayerList[nPlayer].nLives < 0) { if (pPlayer->nLives < 0)
PlayerList[nPlayer].nLives = 0; pPlayer->nLives = 0;
} }
}
PlayerList[nPlayer].ototalvel = PlayerList[nPlayer].totalvel = 0;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------