From f05c56d6cebe03b8f25dab558a89e9e95a9dafea Mon Sep 17 00:00:00 2001 From: def Date: Fri, 11 Jan 2019 09:39:53 +0100 Subject: [PATCH] Fix cl_dyncam_mousesens should only have an effect ingame, not in menus or editor --- src/engine/client/input.cpp | 2 +- src/game/client/components/controls.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/engine/client/input.cpp b/src/engine/client/input.cpp index 3d8b37db1..09c92724d 100644 --- a/src/engine/client/input.cpp +++ b/src/engine/client/input.cpp @@ -71,7 +71,7 @@ void CInput::MouseRelative(float *x, float *y) *y = ny; #else int nx = 0, ny = 0; - float Sens = ((g_Config.m_ClDyncam && g_Config.m_ClDyncamMousesens) ? g_Config.m_ClDyncamMousesens : g_Config.m_InpMousesens) / 100.0f; + float Sens = g_Config.m_InpMousesens / 100.0f; SDL_GetRelativeMouseState(&nx,&ny); diff --git a/src/game/client/components/controls.cpp b/src/game/client/components/controls.cpp index 1c89cadbb..2f785e6d9 100644 --- a/src/game/client/components/controls.cpp +++ b/src/game/client/components/controls.cpp @@ -511,6 +511,11 @@ bool CControls::OnMouseMove(float x, float y) ClampMousePos(); } #else + if(g_Config.m_ClDyncam && g_Config.m_ClDyncamMousesens) + { + x = x * g_Config.m_ClDyncamMousesens / g_Config.m_InpMousesens; + y = y * g_Config.m_ClDyncamMousesens / g_Config.m_InpMousesens; + } m_MousePos[g_Config.m_ClDummy] += vec2(x, y); // TODO: ugly ClampMousePos(); #endif