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

remove unnecessary loop over the possible modifier combinations

Browse source
This commit is contained in:
c0d3d3v 2022-04-28 08:45:25 +02:00
parent e3eeec762d
commit 1a162c08be
No known key found for this signature in database
GPG key ID: 068AF680530DFF31
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,15 +17,11 @@ bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
// Look for a composed bind // Look for a composed bind
bool ret = false; bool ret = false;
for(int Mod = 1; Mod < MODIFIER_COMBINATION_COUNT; Mod++) if(m_pBinds->m_aapKeyBindings[Mask][Event.m_Key])
{ {
if(Mask == Mod && m_pBinds->m_aapKeyBindings[Mod][Event.m_Key]) m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags & IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[Mask][Event.m_Key]);
{ ret = true;
m_pBinds->GetConsole()->ExecuteLineStroked(Event.m_Flags & IInput::FLAG_PRESS, m_pBinds->m_aapKeyBindings[Mod][Event.m_Key]);
ret = true;
}
} }
// Look for a non composed bind // Look for a non composed bind
if(!ret && m_pBinds->m_aapKeyBindings[0][Event.m_Key]) if(!ret && m_pBinds->m_aapKeyBindings[0][Event.m_Key])
{ {
@ -138,16 +134,13 @@ bool CBinds::OnInput(IInput::CEvent e)
Mask &= ~KeyModifierMask; Mask &= ~KeyModifierMask;
bool ret = false; bool ret = false;
for(int Mod = 1; Mod < MODIFIER_COMBINATION_COUNT; Mod++) if(m_aapKeyBindings[Mask][e.m_Key])
{ {
if(m_aapKeyBindings[Mod][e.m_Key] && (Mask == Mod)) if(e.m_Flags & IInput::FLAG_PRESS)
{ Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mask][e.m_Key]);
if(e.m_Flags & IInput::FLAG_PRESS) if(e.m_Flags & IInput::FLAG_RELEASE)
Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mod][e.m_Key]); Console()->ExecuteLineStroked(0, m_aapKeyBindings[Mask][e.m_Key]);
if(e.m_Flags & IInput::FLAG_RELEASE) ret = true;
Console()->ExecuteLineStroked(0, m_aapKeyBindings[Mod][e.m_Key]);
ret = true;
}
} }
if(m_aapKeyBindings[0][e.m_Key] && !ret) if(m_aapKeyBindings[0][e.m_Key] && !ret)