From 6507b1b8026913705b649b2111525db84a3773f0 Mon Sep 17 00:00:00 2001 From: def Date: Sun, 4 Oct 2020 12:14:16 +0200 Subject: [PATCH] Only ignore ctrl+shift for press, not release --- src/game/client/components/binds.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index f34d88f99..9d1b90e72 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -143,11 +143,11 @@ bool CBinds::OnInput(IInput::CEvent e) } } - // shift for emoticons works while moving through map - // When ctrl+shift are pressed (ctrl+shift binds and also the hard-coded ctrl+shift+d, ctrl+shift+g, ctrl+shift+e), ignore other +xxx binds - if(m_aapKeyBindings[0][e.m_Key] && Mask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT)) && (!ret || m_aapKeyBindings[0][e.m_Key][0] == '+')) + // Shift for emoticons works while moving through map + if(m_aapKeyBindings[0][e.m_Key] && (!ret || m_aapKeyBindings[0][e.m_Key][0] == '+')) { - if(e.m_Flags & IInput::FLAG_PRESS) + // When ctrl+shift are pressed (ctrl+shift binds and also the hard-coded ctrl+shift+d, ctrl+shift+g, ctrl+shift+e), ignore other +xxx binds + if(e.m_Flags & IInput::FLAG_PRESS && Mask != ((1 << MODIFIER_CTRL) | (1 << MODIFIER_SHIFT))) 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]);