summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroy <tom_adams@web.de>2021-12-10 14:03:10 +0100
committerGitHub <noreply@github.com>2021-12-10 14:03:10 +0100
commit7e4dc25328e4f6fe6f938397c215b29d12beaf3a (patch)
tree1c3c248f4603b8612792f98ab66002a5a5f10809
parentc25bb6fc6087fafc765daf0d7af05dbf5f65e223 (diff)
parent72af922e36d4f64d37ba94f6885d558681d907c1 (diff)
Merge pull request #2991 from Stiopa866/camera-pr-1
CCamera no longer snaps back to the main-menu position of settings after leaving game
-rw-r--r--src/game/client/components/camera.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/client/components/camera.cpp b/src/game/client/components/camera.cpp
index 5a85bbe15..337fa8e7b 100644
--- a/src/game/client/components/camera.cpp
+++ b/src/game/client/components/camera.cpp
@@ -138,8 +138,12 @@ void CCamera::OnRender()
void CCamera::ChangePosition(int PositionNumber)
{
+ if(m_pClient->Client()->State() == IClient::STATE_ONLINE)
+ return; //Do not change Main Menu Camera Positions while we are changing settings in-game
+
if(PositionNumber < 0 || PositionNumber > NUM_POS-1)
return;
+
m_AnimationStartPos = m_Center;
m_RotationCenter = m_Positions[PositionNumber];
m_CurrentPosition = PositionNumber;