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

Merge pull request #1711 from Learath2/dd_pr_compound_bind_compat

Browse source 
Try to be more accomodating of old players
This commit is contained in:
Dennis Felsing 2019-05-10 23:44:50 +02:00 committed by GitHub
parent 39303e3430 b41529fefd
commit 984df9159f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -136,11 +136,10 @@ bool CBinds::OnInput(IInput::CEvent e)
if(Mask == ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)))
return true;
bool ret = false;
for(int Mod = 0; Mod < MODIFIER_COUNT; Mod++)
for(int Mod = 1; Mod < MODIFIER_COUNT; Mod++)
{
if(m_aapKeyBindings[Mod][e.m_Key] && (((Mask&(1 << Mod)) || (Mod == 0 && m_aapKeyBindings[0][e.m_Key][0] == '+')))) // always trigger +xxx binds despite any modifier
if(m_aapKeyBindings[Mod][e.m_Key] && Mask & (1 << Mod)) // always trigger +xxx binds despite any modifier
{
if(e.m_Flags&IInput::FLAG_PRESS)
Console()->ExecuteLineStroked(1, m_aapKeyBindings[Mod][e.m_Key]);
@ -149,6 +148,16 @@ bool CBinds::OnInput(IInput::CEvent e)
ret = true;
}
}
if(m_aapKeyBindings[0][e.m_Key] && (!ret || m_aapKeyBindings[0][e.m_Key][0] == '+'))
{
if(e.m_Flags&IInput::FLAG_PRESS)
Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][e.m_Key]);
if(e.m_Flags&IInput::FLAG_RELEASE)
Console()->ExecuteLineStroked(0, m_aapKeyBindings[0][e.m_Key]);
ret = true;
}
return ret;
}