hook gores mode directly into bind execution

instead of changing a keys bind to "+fire;+prevweapon" it will append ";+prevweapon" to any command that has +fire and no +prevweapon

Author: qxdFox

src/engine/shared/config_variables_entity.h

@@ -265,11 +265,9 @@ MACRO_CONFIG_INT(ClFreezeKillDebug, ec_freeze_kill_debug, 0, 0, 1, CFGFLAG_CLIEN
 MACRO_CONFIG_INT(SndFriendChat, snd_friend_chat, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Enable regular Chat Sound Only When a Friend Says Something") // Aiodob Menu color plates
 
 // Gores Mode
-MACRO_CONFIG_INT(ClGoresMode, ec_gores_mode, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "always have a gun in your hand :p")
-MACRO_CONFIG_INT(ClGoresModeKey, ec_gores_mode_key, 291, 0, 512, CFGFLAG_CLIENT | CFGFLAG_SAVE, "The key it binds to")
+MACRO_CONFIG_INT(ClGoresMode, ec_gores_mode, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Automatically switches to gun, when firing it switches to hammer and then back")
 MACRO_CONFIG_INT(ClGoresModeDisableIfWeapons, ec_gores_mode_disable_weapons, 1, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Disable Gores Mode When The Player Has Another Weapon")
 MACRO_CONFIG_INT(ClAutoEnableGoresMode, ec_gores_mode_auto_enable, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "enables it on Gores gametype and disables on others")
-MACRO_CONFIG_STR(ClGoresModeSaved, ec_gores_mode_saved, 128, "+fire", CFGFLAG_CLIENT | CFGFLAG_SAVE, "Dont Edit This")
 
 // Tee
 MACRO_CONFIG_INT(ClOwnTeeSkin, ec_own_tee_skin, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Renders your own skin differently for yourself")

src/game/client/component.h

@@ -305,10 +305,11 @@ class CComponent : public CComponentInterfaces
 	virtual void OnSelfDeath()
 	{
 	}
+
 	/*
 	 * Called when the current focus of the window changes, for example when the user alt-tabs out of the game.
 	 * @param Focused `true` if the window is now focused, `false` if it lost focus.
-	*/
+	 */
 	virtual void OnFocusChange(bool Focused)
 	{
 	}

src/game/client/components/binds.cpp

@@ -131,15 +131,21 @@ bool CBinds::OnInput(const IInput::CEvent &Event)
 		if(ActiveBind == m_vActiveBinds.end())
 		{
 			const auto &&OnKeyPress = [&](int Mask) {
-				const char *pBind = m_aapKeyBindings[Mask][Event.m_Key];
+				char aBind[512];
+				str_copy(aBind, m_aapKeyBindings[Mask][Event.m_Key], sizeof(aBind));
 				if(g_Config.m_ClSubTickAiming)
 				{
-					if(str_comp("+fire", pBind) == 0 || str_comp("+hook", pBind) == 0)
+					if(str_comp("+fire", aBind) == 0 || str_comp("+hook", aBind) == 0)
 					{
 						m_MouseOnAction = true;
 					}
 				}
-				Console()->ExecuteLineStroked(1, pBind, IConsole::CLIENT_ID_UNSPECIFIED);
+				if(g_Config.m_ClGoresMode && !GameClient()->m_EClient.m_WeaponsGot && str_find(aBind, "+fire") && !str_find(aBind, "+prevweapon"))
+				{
+					str_append(aBind, ";+prevweapon", sizeof(aBind));
+				}
+
+				Console()->ExecuteLineStroked(1, aBind, IConsole::CLIENT_ID_UNSPECIFIED);
 				m_vActiveBinds.emplace_back(Event.m_Key, Mask);
 			};
 
@@ -162,7 +168,14 @@ bool CBinds::OnInput(const IInput::CEvent &Event)
 			// Have to check for nullptr again because the previous execute can unbind itself
 			if(m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key])
 			{
-				Console()->ExecuteLineStroked(1, m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key], IConsole::CLIENT_ID_UNSPECIFIED);
+				char aBind[512];
+				str_copy(aBind, m_aapKeyBindings[ActiveBind->m_ModifierMask][ActiveBind->m_Key], sizeof(aBind));
+				if(g_Config.m_ClGoresMode && !GameClient()->m_EClient.m_WeaponsGot && str_find(aBind, "+fire") && !str_find(aBind, "+prevweapon"))
+				{
+					str_append(aBind, ";+prevweapon", sizeof(aBind));
+				}
+
+				Console()->ExecuteLineStroked(1, aBind, IConsole::CLIENT_ID_UNSPECIFIED);
 			}
 			Handled = true;
 		}
@@ -184,7 +197,14 @@ bool CBinds::OnInput(const IInput::CEvent &Event)
 			{
 				return;
 			}
-			Console()->ExecuteLineStroked(0, m_aapKeyBindings[Bind.m_ModifierMask][Bind.m_Key], IConsole::CLIENT_ID_UNSPECIFIED);
+			char aBind[512];
+			str_copy(aBind, m_aapKeyBindings[Bind.m_ModifierMask][Bind.m_Key], sizeof(aBind));
+			if(g_Config.m_ClGoresMode && !GameClient()->m_EClient.m_WeaponsGot && str_find(aBind, "+fire") && !str_find(aBind, "+prevweapon"))
+			{
+				str_append(aBind, ";+prevweapon", sizeof(aBind));
+			}
+
+			Console()->ExecuteLineStroked(0, aBind, IConsole::CLIENT_ID_UNSPECIFIED);
 		};
 
 		// Release active bind that uses this primary key

src/game/client/components/entity/commands.cpp

@@ -491,7 +491,6 @@ void CEClient::OnConsoleInit()
 	Console()->Register("specid", "i[id]", CFGFLAG_CLIENT, ConSpectateId, this, "Spectate Id");
 	Console()->Register("crash", "", CFGFLAG_CLIENT, ConCrash, this, "Crash your own client");
 
-	Console()->Chain("ec_gores_mode", ConchainGoresMode, this);
 	Console()->Chain("ec_fast_input", ConchainFastInputs, this);
 	Console()->Chain("ec_fast_input_amount", ConchainFastInputs, this);
 
@@ -502,17 +501,6 @@ void CEClient::OnConsoleInit()
 	Console()->Chain("ec_discord_normal_process_priority", ConchainDiscordProcessPriority, this);
 }
 
-void CEClient::ConchainGoresMode(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
-{
-	pfnCallback(pResult, pCallbackUserData);
-	CEClient *pSelf = (CEClient *)pUserData;
-	if(pResult->NumArguments())
-	{
-		int GoresMode = pResult->GetInteger(0);
-		pSelf->ToggleGoresMode(GoresMode);
-	}
-}
-
 void CEClient::ConchainFastInputs(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
 {
 	pfnCallback(pResult, pCallbackUserData);

src/game/client/components/entity/entity.cpp

@@ -232,74 +232,8 @@ void CEClient::GoresMode()
 			return;
 	}
 
-	int Key = g_Config.m_ClGoresModeKey;
-	if(Key < KEY_FIRST || Key >= KEY_LAST)
-	{
-		g_Config.m_ClGoresMode = 0;
-		dbg_msg("E-Client", "Invalid key: %d", Key);
-		return;
-	}
-	const char *pKeyName = Input()->KeyName(Key);
-	const CBindSlot BindSlot = GameClient()->m_Binds.GetBindSlot(pKeyName);
-	const char *pBind = GameClient()->m_Binds.GetKeyBinding(BindSlot.m_ModifierMask, BindSlot.m_Key);
-	if(!pBind)
-		return;
-
-	bool GoresBind = false;
-
-	if(!str_comp(pBind, "+fire;+prevweapon"))
-		GoresBind = true;
-
-	if(!GoresBind)
-		return;
-
-	if(GoresBind)
-	{
-		if(GameClient()->m_Snap.m_pLocalCharacter->m_Weapon == 0)
-		{
-			GameClient()->m_Controls.m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = 2;
-		}
-	}
-}
-
-void CEClient::GoresModeSave()
-{
-	int Key = g_Config.m_ClGoresModeKey;
-	if(Key < KEY_FIRST || Key >= KEY_LAST)
-	{
-		g_Config.m_ClGoresMode = 0;
-		dbg_msg("E-Client", "Invalid key: %d", Key);
-		return;
-	}
-	const char *pKeyName = Input()->KeyName(Key);
-
-	const CBindSlot BindSlot = GameClient()->m_Binds.GetBindSlot(pKeyName);
-	const char *pBind = GameClient()->m_Binds.GetKeyBinding(BindSlot.m_ModifierMask, BindSlot.m_Key);
-	if(!pBind)
-		return;
-	str_copy(g_Config.m_ClGoresModeSaved, pBind);
-
-	GameClient()->m_Binds.Bind(Key, "+fire;+prevweapon");
-}
-
-void CEClient::GoresModeRestore()
-{
-	int Key = g_Config.m_ClGoresModeKey;
-	if(Key < KEY_FIRST || Key >= KEY_LAST)
-	{
-		g_Config.m_ClGoresMode = 0;
-		dbg_msg("E-Client", "Invalid key: %d", Key);
-		return;
-	}
-	GameClient()->m_Binds.Bind(Key, g_Config.m_ClGoresModeSaved);
-}
-
-void CEClient::ToggleGoresMode(bool Value)
-{
-	if(Value)
-		GoresModeSave();
-	else
-		GoresModeRestore();
+	if(GameClient()->m_Snap.m_pLocalCharacter->m_Weapon == 0)
+		GameClient()->m_Controls.m_aInputData[g_Config.m_ClDummy].m_WantedWeapon = WEAPON_GUN + 1;
 }
 
 void CEClient::OnConnect()
@@ -330,7 +264,7 @@ void CEClient::OnConnect()
 	{
 		if(g_Config.m_ClAutoEnableGoresMode)
 		{
-			if(str_find(CurrentServerInfo.m_aGameType, "Gores"))
+			if(str_find_nocase(CurrentServerInfo.m_aGameType, "Gores"))
 			{
 				m_GoresServer = true;
 				g_Config.m_ClGoresMode = 1;

src/game/client/components/entity/entity.h

@@ -16,7 +16,6 @@ class CEClient : public CComponent
 	bool m_AttemptedJoinTeam;
 	bool m_JoinedTeam;
 
-	bool m_WeaponsGot;
 	bool m_GoresServer;
 
 	// Reply to Ping
@@ -63,16 +62,16 @@ class CEClient : public CComponent
 
 	static void ConCrash(IConsole::IResult *pResult, void *pUserData);
 
-	static void ConchainGoresMode(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainFastInputs(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainDiscordUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
-	
+
 	static void ConchainDDNetProcessPriority(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainDiscordProcessPriority(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 
 	static void DiscordPriorityThread(void *pUserData);
 
 public:
+	bool m_WeaponsGot;
 	int m_KillCount;
 
 	void Votekick(const char *pName, const char *pReason);
@@ -120,10 +119,6 @@ class CEClient : public CComponent
 
 	void GoresMode();
 
-	void GoresModeSave();
-	void GoresModeRestore();
-	void ToggleGoresMode(bool Value);
-
 	int64_t m_JoinTeam;
 	void AutoJoinTeam();
 	void OnConnect();

src/game/client/components/entity/menus_entity.cpp

@@ -2589,43 +2589,10 @@ void CMenus::RenderSettingsEClient(CUIRect MainView)
 			GoresMode.HSplitTop(HeaderHeight, &Button, &GoresMode);
 			Ui()->DoLabel(&Button, Localize("Gores Mode"), HeaderSize, HeaderAlignment);
 
-			if(DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClGoresMode, ("\"advanced\" Gores Mode"), &g_Config.m_ClGoresMode, &GoresMode, LineSize))
-				GameClient()->m_EClient.ToggleGoresMode(g_Config.m_ClGoresMode);
+			DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClGoresMode, ("\"advanced\" Gores Mode"), &g_Config.m_ClGoresMode, &GoresMode, LineSize);
 
 			DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClGoresModeDisableIfWeapons, ("Disable if You Have Any Weapon"), &g_Config.m_ClGoresModeDisableIfWeapons, &GoresMode, LineSize);
 			DoButton_CheckBoxAutoVMarginAndSet(&g_Config.m_ClAutoEnableGoresMode, ("Auto Enable if Gametype is \"Gores\""), &g_Config.m_ClAutoEnableGoresMode, &GoresMode, LineSize);
-
-			// Key Reader for Gores Mode
-			{
-				static CBindSlot s_GoresBind(g_Config.m_ClGoresModeKey, 0);
-				if(s_GoresBind.m_Key != g_Config.m_ClGoresModeKey)
-					s_GoresBind.m_Key = g_Config.m_ClGoresModeKey;
-
-				const char *pText = Localize("Gores Mode Key:");
-				float Length = TextRender()->TextBoundingBox(FontSize, pText).m_W + 3.5f;
-				CUIRect KeyLabel, KeyButton;
-				GoresMode.HSplitTop(LineSize, &KeyButton, &GoresMode);
-				KeyButton.VSplitLeft(Length, &KeyLabel, &KeyButton);
-
-				Ui()->DoLabel(&KeyLabel, pText, 14.0f, TEXTALIGN_ML);
-
-				static CButtonContainer s_ReaderButtonGores;
-				const auto Result = GameClient()->m_KeyBinder.DoKeyReader(&s_ReaderButtonGores, &KeyButton, s_GoresBind, false);
-
-				if(Result.m_Bind != s_GoresBind)
-				{
-					GameClient()->m_EClient.GoresModeRestore();
-
-					if(Result.m_Bind.m_Key == KEY_UNKNOWN)
-						g_Config.m_ClGoresModeKey = KEY_UNKNOWN;
-					else
-					{
-						s_GoresBind = Result.m_Bind;
-						g_Config.m_ClGoresModeKey = s_GoresBind.m_Key;
-					}
-					GameClient()->m_EClient.GoresModeSave();
-				}
-			}
 		}
 	}