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

Merge #2916

Browse source 
2916: Make sure turning dyncam off in settings works r=Jupeyy a=def-

Even if players have cl_mouse_followfactor turned on

Alternative fix for #2761 since players keep reporting confusion about this

Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-09-24 16:54:14 +00:00 committed by GitHub
parent 75dcbb8ca6 f7cf854c36
commit ab8ad776f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/client/components/menus_settings.cpp
View file

@ -90,8 +90,19 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
// dynamic camera
Left.HSplitTop(20.0f, &Button, &Left);
if(DoButton_CheckBox(&g_Config.m_ClDyncam, Localize("Dynamic Camera"), g_Config.m_ClDyncam, &Button))
g_Config.m_ClDyncam ^= 1;
bool IsDyncam = g_Config.m_ClDyncam || g_Config.m_ClMouseFollowfactor > 0;
if(DoButton_CheckBox(&IsDyncam, Localize("Dynamic Camera"), IsDyncam, &Button))
{
if(IsDyncam)
{
g_Config.m_ClDyncam = 0;
g_Config.m_ClMouseFollowfactor = 0;
}
else
{
g_Config.m_ClDyncam = 1;
}
}
// weapon pickup
Left.HSplitTop(5.0f, 0, &Left);