Disable buttonwatch by default, as it breaks CS#

- Add config cs2fixes.jsonc for configs that require a restart to changes - Fix c_bw using console instead of chat for command echo
Source2ZE · Jul 10, 2024 · 29820fa · 29820fa
1 parent 5959487
commit 29820fa
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/configs/cs2fixes.jsonc.example b/configs/cs2fixes.jsonc.example
@@ -0,0 +1,4 @@
+// Configs in this file require a server restart to change
+{
+	"enable_button_watch": false // Whether to enable button watch or not. CS# BREAKS WITH THIS ENABLED.
+}
diff --git a/src/adminsystem.cpp b/src/adminsystem.cpp
@@ -36,6 +36,10 @@
 #include "votemanager.h"
 #include "map_votes.h"
 #include <vector>
+#include <fstream>
+#include "vendor/nlohmann/json.hpp"
+
+using json = nlohmann::json;
 
 extern IVEngineServer2 *g_pEngineServer2;
 extern CGameEntitySystem *g_pEntitySystem;
@@ -1416,16 +1420,32 @@ CON_COMMAND_CHAT_FLAGS(add_dc, "<name> <SteamID 64> <IP Address> - Adds a fake p
 
 CON_COMMAND_CHAT_FLAGS(bw, "- Toggle button watch display", ADMFLAG_GENERIC)
 {
+
+	std::ifstream ifsConfig((std::string(Plat_GetGameDirectory()) + "\\csgo\\addons\\cs2fixes\\configs\\cs2fixes.jsonc"), std::fstream::in);
+	if (!ifsConfig.is_open())
+	{
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Button watch is disabled on this server.");
+		return;
+	}
+
+	json jConfig = json::parse(ifsConfig, nullptr, true, true);
+	if (jConfig.empty() || !jConfig.value("enable_button_watch", false))
+	{
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Button watch is disabled on this server.");
+		return;
+	}
+
+
 	if (!player)
 	{
-		ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "You cannot use this command from the server console.");
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "You cannot use this command from the server console.");
 		return;
 	}
 
 	ZEPlayer* zpPlayer = player->GetZEPlayer();
 	if (!zpPlayer)
 	{
-		ClientPrint(player, HUD_PRINTCONSOLE, CHAT_PREFIX "Something went wrong...");
+		ClientPrint(player, HUD_PRINTTALK, CHAT_PREFIX "Something went wrong...");
 		return;
 	}
 

diff --git a/src/detours.cpp b/src/detours.cpp
@@ -47,10 +47,15 @@
 #include "serversideclient.h"
 #include "networksystem/inetworkserializer.h"
 #include "map_votes.h"
+#include <fstream>
+#include "vendor/nlohmann/json.hpp"
 #include "tier0/vprof.h"
 
 #include "tier0/memdbgon.h"
 
+
+using json = nlohmann::json;
+
 extern CGlobalVars *gpGlobals;
 extern CGameEntitySystem *g_pEntitySystem;
 extern IGameEventManager2 *g_gameEventManager;
@@ -596,6 +601,17 @@ bool InitDetours(CGameConfig *gameConfig)
 
 	FOR_EACH_VEC(g_vecDetours, i)
 	{
+		if (!V_strcmp(g_vecDetours[i]->GetName(), "CEntityIOOutput_FireOutputInternal"))
+		{
+			std::ifstream ifsConfig((std::string(Plat_GetGameDirectory()) + "\\csgo\\addons\\cs2fixes\\configs\\cs2fixes.jsonc"), std::fstream::in);
+			if (!ifsConfig.is_open())
+				continue;
+
+			json jConfig = json::parse(ifsConfig, nullptr, true, true);
+			if (jConfig.empty() || !jConfig.value("enable_button_watch", false))
+				continue;
+		}
+
 		if (!g_vecDetours[i]->CreateDetour(gameConfig))
 			success = false;