From 1e900af5fae62a8d831edd5d531dcad5f8012750 Mon Sep 17 00:00:00 2001 From: def Date: Sat, 3 Oct 2020 10:03:16 +0200 Subject: [PATCH] Disable +xxx binds when pressing ctrl+shift Seems a bit more general than hardcoding ctrl+shift+d, ctrl+shift+g, ctrl+shift+e --- src/game/client/components/binds.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index cf3d0f28a..f34d88f99 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -143,7 +143,9 @@ bool CBinds::OnInput(IInput::CEvent e) } } - if(m_aapKeyBindings[0][e.m_Key] && (!ret || m_aapKeyBindings[0][e.m_Key][0] == '+')) // always trigger +xxx binds despite any modifier + // 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] == '+')) { if(e.m_Flags & IInput::FLAG_PRESS) Console()->ExecuteLineStroked(1, m_aapKeyBindings[0][e.m_Key]);