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

Fixed bug where composed binds would trigger simple binds ingame. Composed binds now work in menus even without including an Fn button

Browse source
This commit is contained in:
Jordy Ruiz 2018-10-31 14:27:52 +01:00
parent 404d8d709a
commit 9188a357b9
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/game/client/components/binds.cpp
View file

@ -59,8 +59,8 @@ bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
Mask = 1; // if no modifier, flag with MODIFIER_NONE Mask = 1; // if no modifier, flag with MODIFIER_NONE
bool rtn = false; bool rtn = false;
// don't handle invalid events and keys that aren't set to anything // don't handle anything but FX and composed binds
if(!((Event.m_Key >= KEY_F1 && Event.m_Key <= KEY_F12) || (Event.m_Key >= KEY_F13 && Event.m_Key <= KEY_F24))) if(Mask == 1 && !(Event.m_Key >= KEY_F1 && Event.m_Key <= KEY_F12) && !(Event.m_Key >= KEY_F13 && Event.m_Key <= KEY_F24))
return false; return false;
for(int m = 0; m < MODIFIER_COUNT; m++) for(int m = 0; m < MODIFIER_COUNT; m++)
@ -78,7 +78,7 @@ bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
return rtn; return rtn;
} }
bool CBinds::OnInput(IInput::CEvent e) bool CBinds::OnInput(IInput::CEvent Event)
{ {
int Mask = 0; int Mask = 0;
// since we only handle one modifier, when doing ctrl+q and shift+q, execute both // since we only handle one modifier, when doing ctrl+q and shift+q, execute both
@ -91,20 +91,20 @@ bool CBinds::OnInput(IInput::CEvent e)
Mask = 1; // if no modifier, flag with MODIFIER_NONE Mask = 1; // if no modifier, flag with MODIFIER_NONE
// don't handle invalid events and keys that aren't set to anything // don't handle invalid events and keys that aren't set to anything
if(e.m_Key <= 0 || e.m_Key >= KEY_LAST) if(Event.m_Key <= 0 || Event.m_Key >= KEY_LAST)
return false; return false;
bool rtn = false; bool rtn = false;
for(int m = 0; m < MODIFIER_COUNT; m++) for(int m = 0; m < MODIFIER_COUNT; m++)
{ {
if((Mask&(1 << m)) && m_aaaKeyBindings[e.m_Key][m][0] == 0) if((Mask&(1 << m)) && m_aaaKeyBindings[Event.m_Key][m][0] != 0)
continue; {
if(Event.m_Flags&IInput::FLAG_PRESS)
if(e.m_Flags&IInput::FLAG_PRESS) Console()->ExecuteLineStroked(1, m_aaaKeyBindings[Event.m_Key][m]);
Console()->ExecuteLineStroked(1, m_aaaKeyBindings[e.m_Key][m]); if(Event.m_Flags&IInput::FLAG_RELEASE)
if(e.m_Flags&IInput::FLAG_RELEASE) Console()->ExecuteLineStroked(0, m_aaaKeyBindings[Event.m_Key][m]);
Console()->ExecuteLineStroked(0, m_aaaKeyBindings[e.m_Key][m]); rtn = true;
rtn = true; }
} }
return rtn; return rtn;
} }