From c9e33b92cc656c6df7e895ae54b37e6afd0a9729 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 7 Sep 2022 22:02:15 +1000 Subject: [PATCH] - Ensure all games consistently scale out for chase cam mode. --- source/games/blood/src/osdcmd.cpp | 6 ++++++ source/games/blood/src/view.cpp | 2 -- source/games/sw/src/osdcmds.cpp | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/source/games/blood/src/osdcmd.cpp b/source/games/blood/src/osdcmd.cpp index ae7622b32..7d91a9ec8 100644 --- a/source/games/blood/src/osdcmd.cpp +++ b/source/games/blood/src/osdcmd.cpp @@ -58,9 +58,15 @@ void GameInterface::ToggleThirdPerson() { if (gamestate != GS_LEVEL) return; if (gViewPos > VIEWPOS_0) + { gViewPos = VIEWPOS_0; + } else + { gViewPos = VIEWPOS_1; + cameradist = 0; + cameraclock = INT_MIN; + } } void GameInterface::SwitchCoopView() diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp index b5b313210..36ef2cabc 100644 --- a/source/games/blood/src/view.cpp +++ b/source/games/blood/src/view.cpp @@ -557,8 +557,6 @@ void SetupView(int& cX, int& cY, int& cZ, DAngle& cA, fixedhoriz& cH, sectortype cZ += bobHeight; } cZ += int(cH.asq16() * (1. / 6553.6)); - cameradist = -1; - cameraclock = PlayClock + MulScale(4, (int)gInterpolate, 16); } else { diff --git a/source/games/sw/src/osdcmds.cpp b/source/games/sw/src/osdcmds.cpp index 8feaea51f..9ae6b4bc9 100644 --- a/source/games/sw/src/osdcmds.cpp +++ b/source/games/sw/src/osdcmds.cpp @@ -107,6 +107,7 @@ void GameInterface::ToggleThirdPerson() { pp->Flags |= (PF_VIEW_FROM_OUTSIDE); cameradist = 0; + cameraclock = INT_MIN; } }