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

- Exhumed: Pass player pointer through to updatePlayerTarget().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-24 11:59:34 +11:00
parent cdffb61cc7
commit 7293a1f5d1
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/exhumed/src/exhumed.cpp
View file

@ -282,10 +282,9 @@ void DoGameOverScene(bool finallevel)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void updatePlayerTarget(const int nPlayer) static void updatePlayerTarget(Player* const pPlayer)
{ {
const auto pPlayer = &PlayerList[nPlayer]; const auto pRa = &Ra[pPlayer->nPlayer];
const auto pRa = &Ra[nPlayer];
const auto pPlayerActor = pPlayer->pActor; const auto pPlayerActor = pPlayer->pActor;
const auto nAngVect = (-pPlayerActor->spr.Angles.Yaw).ToVector(); const auto nAngVect = (-pPlayerActor->spr.Angles.Yaw).ToVector();
@ -330,7 +329,7 @@ static void updatePlayerTarget(const int nPlayer)
if (bestTarget) if (bestTarget)
{ {
if (nPlayer == nLocalPlayer) nCreepyTimer = kCreepyCount; if (pPlayer->nPlayer == nLocalPlayer) nCreepyTimer = kCreepyCount;
if (!cansee(pPlayerActor->spr.pos, pPlayerActor->sector(), bestTarget->spr.pos.plusZ(-GetActorHeight(bestTarget)), bestTarget->sector())) if (!cansee(pPlayerActor->spr.pos, pPlayerActor->sector(), bestTarget->spr.pos.plusZ(-GetActorHeight(bestTarget)), bestTarget->sector()))
{ {
@ -541,7 +540,7 @@ void GameInterface::Ticker()
updatePlayerVelocity(pPlayer); updatePlayerVelocity(pPlayer);
updatePlayerInventory(pPlayer); updatePlayerInventory(pPlayer);
updatePlayerWeapon(pPlayer); updatePlayerWeapon(pPlayer);
updatePlayerTarget(i); updatePlayerTarget(pPlayer);
} }
GameMove(); GameMove();