edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cl_dyncam_mousesens

Browse source 
should only have an effect ingame, not in menus or editor
This commit is contained in:
def 2019-01-11 09:39:53 +01:00
parent 22ea30a7f5
commit f05c56d6ce
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/input.cpp
View file

@ -71,7 +71,7 @@ void CInput::MouseRelative(float *x, float *y)
*y = ny; *y = ny;
#else #else
int nx = 0, ny = 0; 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); SDL_GetRelativeMouseState(&nx,&ny);

5
src/game/client/components/controls.cpp
View file

@ -511,6 +511,11 @@ bool CControls::OnMouseMove(float x, float y)
ClampMousePos(); ClampMousePos();
} }
#else #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 m_MousePos[g_Config.m_ClDummy] += vec2(x, y); // TODO: ugly
ClampMousePos(); ClampMousePos();
#endif #endif