zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 04:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: General tidy-up of AIPlayer::Damage().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-25 20:23:57 +11:00
parent c3f0edf802
commit f0b9937ec7
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -606,37 +606,30 @@ void AIPlayer::Damage(RunListEvent* ev)
assert(nPlayer >= 0 && nPlayer < kMaxPlayers); assert(nPlayer >= 0 && nPlayer < kMaxPlayers);
const auto pPlayer = &PlayerList[nPlayer]; const auto pPlayer = &PlayerList[nPlayer];
const auto pPlayerActor = pPlayer->pActor;
const auto nAction = pPlayer->nAction;
const auto nDamage = ev->nDamage; const auto nDamage = ev->nDamage;
if (!nDamage) { if (!nDamage || !pPlayer->nHealth)
return; return;
}
DExhumedActor* pActor2 = (!ev->isRadialEvent()) ? ev->pOtherActor : ev->pRadialActor->pTarget.Get(); const auto pPlayerActor = pPlayer->pActor;
const auto pDamageActor = (!ev->isRadialEvent()) ? ev->pOtherActor : ev->pRadialActor->pTarget.Get();
// ok continue case 0x80000 as normal, loc_1C57C
if (!pPlayer->nHealth) {
return;
}
if (!pPlayer->invincibility) if (!pPlayer->invincibility)
{ {
pPlayer->nHealth -= nDamage; pPlayer->nHealth -= nDamage;
if (nPlayer == nLocalPlayer) if (nPlayer == nLocalPlayer)
{
TintPalette(nDamage, 0, 0); TintPalette(nDamage, 0, 0);
} }
}
if (pPlayer->nHealth > 0) if (pPlayer->nHealth > 0)
{ {
if (nDamage > 40 || (totalmoves & 0xF) < 2) if (nDamage > 40 || (totalmoves & 0xF) < 2)
{ {
if (pPlayer->invincibility) { if (pPlayer->invincibility)
return; return;
}
const auto nAction = pPlayer->nAction;
if (pPlayerActor->sector()->Flag & kSectUnderwater) if (pPlayerActor->sector()->Flag & kSectUnderwater)
{ {
@ -654,9 +647,10 @@ void AIPlayer::Damage(RunListEvent* ev)
pPlayer->nSeqSize = 0; pPlayer->nSeqSize = 0;
pPlayer->nAction = 4; pPlayer->nAction = 4;
if (pActor2) if (pDamageActor)
{ {
pPlayer->nPlayerSwear--; pPlayer->nPlayerSwear--;
if (pPlayer->nPlayerSwear <= 0) if (pPlayer->nPlayerSwear <= 0)
{ {
D3PlayFX(StaticSound[kSound52], pPlayer->pDoppleSprite); D3PlayFX(StaticSound[kSound52], pPlayer->pDoppleSprite);
@ -666,17 +660,12 @@ void AIPlayer::Damage(RunListEvent* ev)
} }
} }
} }
return;
} }
else else // player has died
{ {
// player has died if (pDamageActor && pDamageActor->spr.statnum == 100)
if (pActor2 && pActor2->spr.statnum == 100)
{ {
int nPlayer2 = GetPlayerFromActor(pActor2); if (GetPlayerFromActor(pDamageActor) == nPlayer) // player caused their own death
if (nPlayer2 == nPlayer) // player caused their own death
{ {
pPlayer->nPlayerScore--; pPlayer->nPlayerScore--;
} }
@ -685,7 +674,7 @@ void AIPlayer::Damage(RunListEvent* ev)
pPlayer->nPlayerScore++; pPlayer->nPlayerScore++;
} }
} }
else if (pActor2 == nullptr) else if (pDamageActor == nullptr)
{ {
pPlayer->nPlayerScore--; pPlayer->nPlayerScore--;
} }