From eda002993e65560e36c36024ca445c2e2b0c3d78 Mon Sep 17 00:00:00 2001 From: 12pm <30786226+12pm@users.noreply.github.com> Date: Fri, 10 May 2019 23:07:32 +0200 Subject: [PATCH 1/2] Restore old echo default color --- src/engine/shared/config_variables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 4359c3b89..7aaf7d924 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -248,7 +248,7 @@ MACRO_CONFIG_INT(ClReconnectTimeout, cl_reconnect_timeout, 120, 0, 600, CFGFLAG_ MACRO_CONFIG_INT(ClReconnectFull, cl_reconnect_full, 5, 0, 600, CFGFLAG_CLIENT | CFGFLAG_SAVE, "How many seconds to wait before reconnecting (when server is full, 0 for off)") MACRO_CONFIG_COL(ClMessageSystemCol, cl_message_system_col, 2817983, 0, 0xFFFFFF, CFGFLAG_CLIENT | CFGFLAG_SAVE, "System message color") -MACRO_CONFIG_COL(ClMessageClientCol, cl_message_client_col, 65472, 0, 0xFFFFFF, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Client message color") +MACRO_CONFIG_COL(ClMessageClientCol, cl_message_client_col, 9633471, 0, 0xFFFFFF, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Client message color") MACRO_CONFIG_COL(ClMessageHighlightCol, cl_message_highlight_col, 65471, 0, 0xFFFFFF, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Highlighted message color") MACRO_CONFIG_COL(ClMessageTeamCol, cl_message_team_col, 5636050, 0, 0xFFFFFF, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Team message color") MACRO_CONFIG_COL(ClMessageCol, cl_message_col, 255, 0, 0xFFFFFF, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Message color") From b41529fefd17b48529523045503d8df2f0010646 Mon Sep 17 00:00:00 2001 From: Learath2 Date: Sat, 11 May 2019 01:38:15 +0200 Subject: [PATCH 2/2] Try to be more accomodating of old players --- src/game/client/components/binds.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/game/client/components/binds.cpp b/src/game/client/components/binds.cpp index 841ce44a4..620a76358 100644 --- a/src/game/client/components/binds.cpp +++ b/src/game/client/components/binds.cpp @@ -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; }