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

Do not let SpecialBinds capture anything that doesn't have an Fn key

Browse source
This commit is contained in:
Jordy Ruiz 2018-11-12 22:14:49 +01:00
parent 54760abc9d
commit 5194cf66fe
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
#include <engine/shared/config.h> #include <engine/shared/config.h>
#include "binds.h" #include "binds.h"
const int CBinds::s_aDefaultBindKeys[] = { const int CBinds::s_aDefaultBindKeys[] = { // only simple binds
KEY_F1, KEY_F2, KEY_TAB, 'u', KEY_F10, KEY_F1, KEY_F2, KEY_TAB, 'u', KEY_F10,
'a', 'd', 'a', 'd',
KEY_SPACE, KEY_MOUSE_1, KEY_MOUSE_2, KEY_LSHIFT, KEY_RSHIFT, KEY_RIGHT, KEY_LEFT, KEY_SPACE, KEY_MOUSE_1, KEY_MOUSE_2, KEY_LSHIFT, KEY_RSHIFT, KEY_RIGHT, KEY_LEFT,
@ -25,7 +25,6 @@ const char CBinds::s_aaDefaultBindValues[][32] = {
"ready_change", "ready_change",
}; };
CBinds::CBinds() CBinds::CBinds()
{ {
mem_zero(m_aaaKeyBindings, sizeof(m_aaaKeyBindings)); mem_zero(m_aaaKeyBindings, sizeof(m_aaaKeyBindings));
@ -79,21 +78,20 @@ bool CBinds::ModifierMatchesKey(int Modifier, int Key)
bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event) bool CBinds::CBindsSpecial::OnInput(IInput::CEvent Event)
{ {
int Mask = GetModifierMask(Input()); int Mask = GetModifierMask(Input());
bool rtn = false;
// don't handle anything but FX and composed binds // don't handle anything but FX and composed FX binds
if(Mask == 1 && !(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;
bool rtn = false;
for(int m = 0; m < MODIFIER_COUNT; m++) for(int m = 0; m < MODIFIER_COUNT; m++)
{ {
if((Mask&(1 << m)) && m_pBinds->m_aaaKeyBindings[Event.m_Key][m][0] != 0) if((Mask&(1 << m)) && m_pBinds->m_aaaKeyBindings[Event.m_Key][m][0] != 0)
{ {
int Stroke = 0;
if(Event.m_Flags&IInput::FLAG_PRESS) if(Event.m_Flags&IInput::FLAG_PRESS)
Stroke = 1; m_pBinds->GetConsole()->ExecuteLineStroked(1, m_pBinds->m_aaaKeyBindings[Event.m_Key][m]);
if(Event.m_Flags&IInput::FLAG_RELEASE)
m_pBinds->GetConsole()->ExecuteLineStroked(Stroke, m_pBinds->m_aaaKeyBindings[Event.m_Key][m]); m_pBinds->GetConsole()->ExecuteLineStroked(0, m_pBinds->m_aaaKeyBindings[Event.m_Key][m]);
rtn = true; rtn = true;
} }
} }