From 4cdced60b12e7a6b223e29afe8096f8767d066b8 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Fri, 24 Mar 2023 18:09:02 +1100 Subject: [PATCH] - Exhumed: Tidy up some pos/sect variables on the stack. --- source/games/exhumed/src/player.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 52b11de820..dcaa1c98e3 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -1168,11 +1168,8 @@ void AIPlayer::Tick(RunListEvent* ev) doPlayerGravity(pPlayerActor); // loc_1A4E6 - auto pSector = pPlayerActor->sector(); int nSectFlag = pPlayer->pPlayerViewSect->Flag; - auto playerPos = pPlayerActor->spr.pos.XY(); - DVector2 vect = pPlayer->vel; double zz = pPlayerActor->vel.Z; @@ -1184,8 +1181,8 @@ void AIPlayer::Tick(RunListEvent* ev) vect *= 0.5; } - auto spr_pos = pPlayerActor->spr.pos; - auto spr_sect = pPlayerActor->sector(); + const auto spr_pos = pPlayerActor->spr.pos; + const auto spr_sect = pPlayerActor->sector(); // TODO // nSectFlag & kSectUnderwater; @@ -1331,11 +1328,8 @@ void AIPlayer::Tick(RunListEvent* ev) pPlayer->nDestVertPan = maphoriz((pPlayerActor->spr.pos.Z - spr_pos.Z) * 2.); } - playerPos -= pPlayerActor->spr.pos.XY(); - - pPlayer->ototalvel = pPlayer->totalvel; - pPlayer->totalvel = int(playerPos.Length() * worldtoint); + pPlayer->totalvel = int((spr_pos.XY() - pPlayerActor->spr.pos.XY()).Length() * worldtoint); auto pViewSect = pPlayerActor->sector(); @@ -1523,11 +1517,11 @@ void AIPlayer::Tick(RunListEvent* ev) } } - if (pSector != pPlayerActor->sector()) + if (spr_sect != pPlayerActor->sector()) { - if (pSector->lotag > 0) + if (spr_sect->lotag > 0) { - runlist_SignalRun(pSector->lotag - 1, nPlayer, &ExhumedAI::EnterSector); + runlist_SignalRun(spr_sect->lotag - 1, nPlayer, &ExhumedAI::EnterSector); } if (pPlayerActor->sector()->lotag > 0)