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: Clean up some of the repeated sector gets in doPlayerMovement().

Browse source
This commit is contained in:
Mitchell Richters 2023-03-27 08:03:14 +11:00
parent d45be79c24
commit 6aceb7bda3
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1693,17 +1693,17 @@ static bool doPlayerMovement(Player* const pPlayer)
if (bSlipMode)
{
SetActor(pPlayerActor, pPlayerActor->spr.pos + spr_vel.XY());
pPlayerActor->spr.pos.Z = pPlayerActor->sector()->floorz;
pPlayerActor->spr.pos.Z = spr_sect->floorz;
}
else
{
nMove = movesprite(pPlayerActor, spr_vel.XY(), spr_vel.Z, -20, CLIPMASK0);
auto pPlayerSect = pPlayerActor->sector();
pushmove(pPlayerActor->spr.pos, &pPlayerSect, pPlayerActor->clipdist, 20, -20, CLIPMASK0);
auto pTempSect = spr_sect;
pushmove(pPlayerActor->spr.pos, &pTempSect, pPlayerActor->clipdist, 20, -20, CLIPMASK0);
if (pPlayerSect != pPlayerActor->sector())
ChangeActorSect(pPlayerActor, pPlayerSect);
if (pTempSect != spr_sect)
ChangeActorSect(pPlayerActor, pTempSect);
if (inside(pPlayerActor->spr.pos.X, pPlayerActor->spr.pos.Y, pPlayerActor->sector()) != 1)
{
@ -1715,13 +1715,14 @@ static bool doPlayerMovement(Player* const pPlayer)
}
}
const bool bUnderwater = pPlayerActor->sector()->Flag & kSectUnderwater;
const auto pPlayerSect = pPlayerActor->sector();
const bool bUnderwater = pPlayerSect->Flag & kSectUnderwater;
if (bUnderwater)
pPlayer->nThrust *= 0.5;
// Trigger Ramses?
if ((pPlayerActor->sector()->Flag & 0x8000) && bTouchFloor)
if ((pPlayerSect->Flag & 0x8000) && bTouchFloor)
return false;
// update player angles here as per the original workflow.