From 1888b7ee9fe3d55ecf097136f43c91a5f37923fa Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 26 Mar 2023 20:09:43 +1100 Subject: [PATCH] - Exhumed: Ensure we back up the player actor's location after doing everything and not mid-way through a reset. --- source/games/exhumed/src/player.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index abafb6f97..ab6680037 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -225,14 +225,11 @@ void RestartPlayer(int nPlayer) pPlayerActor->spr.extra = -1; pPlayerActor->spr.lotag = runlist_HeadRun() + 1; pPlayerActor->clipdist = 14.5; - pPlayerActor->oviewzoffset = pPlayerActor->viewzoffset = -55.; + pPlayerActor->viewzoffset = -55.; pPlayerActor->vel.X = 0; pPlayerActor->vel.Y = 0; pPlayerActor->vel.Z = 0; - pPlayerActor->backuploc(); pPlayerActor->spr.intowner = runlist_AddRunRec(pPlayerActor->spr.lotag - 1, nPlayer, 0xA0000); - - ChangeActorSect(pPlayerActor, pPlayer->sPlayerSave.pSector); ChangeActorStat(pPlayerActor, 100); if (nTotalPlayers > 1) @@ -258,9 +255,12 @@ void RestartPlayer(int nPlayer) pPlayerActor->spr.pos.XY() = pPlayer->sPlayerSave.pos.XY(); pPlayerActor->spr.pos.Z = pPlayer->sPlayerSave.pSector->floorz; pPlayerActor->spr.Angles.Yaw = pPlayer->sPlayerSave.nAngle; + ChangeActorSect(pPlayerActor, pPlayer->sPlayerSave.pSector); pFloorSprite = nullptr; } + pPlayerActor->backuploc(); + pDopSprite = insertActor(pPlayerActor->sector(), 100); pDopSprite->spr.pos = pPlayerActor->spr.pos; pDopSprite->spr.scale = pPlayerActor->spr.scale;