ChaosMod: Use DoesFeatureFlagExist helper function

gta-chaos-mod · Feb 16, 2024 · ad9bc47 · ad9bc47
1 parent 197f859
commit ad9bc47
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/ChaosMod/Components/Voting.cpp b/ChaosMod/Components/Voting.cpp
@@ -369,7 +369,7 @@ bool Voting::Init()
 	auto str                     = _wcsdup(VOTING_PROXY_START_ARGS);
 #ifdef _DEBUG
 	DWORD attributes = NULL;
-	if (DoesFileExist("chaosmod\\.forcenovotingconsole"))
+	if (DoesFeatureFlagExist("forcenovotingconsole"))
 	{
 		attributes = CREATE_NO_WINDOW;
 	}

diff --git a/ChaosMod/Effects/Effect.h b/ChaosMod/Effects/Effect.h
@@ -144,7 +144,7 @@ class RegisterEffect
 	{
 		static bool disableEffectRegistration = []()
 		{
-			return DoesFileExist("chaosmod\\.disablebuiltineffects");
+			return DoesFeatureFlagExist("disablebuiltineffects");
 		}();
 
 		if (disableEffectRegistration)

diff --git a/ChaosMod/Main.cpp b/ChaosMod/Main.cpp
@@ -80,7 +80,7 @@ static void Init()
 	}();
 
 	static std::streambuf *oldStreamBuf;
-	if (DoesFileExist("chaosmod\\.enableconsole"))
+	if (DoesFeatureFlagExist("enableconsole"))
 	{
 		if (GetConsoleWindow())
 		{
@@ -147,7 +147,7 @@ static void Init()
 	g_Random.SetSeed(g_OptionsManager.GetConfigValue({ "Seed" }, 0));
 
 	std::set<std::string> blacklistedComponentNames;
-	if (DoesFileExist("chaosmod\\.blacklistedcomponents"))
+	if (DoesFeatureFlagExist("blacklistedcomponents"))
 	{
 		std::ifstream file("chaosmod\\.blacklistedcomponents");
 		if (!file.fail())
@@ -200,7 +200,7 @@ static void Init()
 	INIT_COMPONENT("HelpTextQueue", "script help text queue", HelpTextQueue);
 
 #ifdef WITH_DEBUG_PANEL_SUPPORT
-	if (DoesFileExist("chaosmod\\.enabledebugsocket"))
+	if (DoesFeatureFlagExist("enabledebugsocket"))
 	{
 		INIT_COMPONENT("DebugSocket", "Debug Websocket", DebugSocket);
 	}
@@ -276,7 +276,7 @@ static void MainRun()
 			{
 				isDisabled = false;
 
-				if (DoesFileExist("chaosmod\\.clearlogfileonreset"))
+				if (DoesFeatureFlagExist("clearlogfileonreset"))
 				{
 					// Clear log
 					g_Log = std::ofstream(CHAOS_LOG_FILE);

diff --git a/ChaosMod/Memory/Memory.cpp b/ChaosMod/Memory/Memory.cpp
@@ -26,7 +26,7 @@ namespace Memory
 
 		MH_Initialize();
 
-		if (DoesFileExist("chaosmod\\.skipintro"))
+		if (DoesFeatureFlagExist("skipintro"))
 		{
 			// Splash screen
 			Handle handle = FindPattern("E8 ? ? ? ? 8B CF 40 88 2D");
@@ -58,7 +58,7 @@ namespace Memory
 			}
 		}
 
-		if (DoesFileExist("chaosmod\\.skipdlcs"))
+		if (DoesFeatureFlagExist("skipdlcs"))
 		{
 			Handle handle = FindPattern("84 C0 74 2C 48 8D 15 ? ? ? ? 48 8D 0D ? ? ? ? 45 33 C9 41 B0 01");
 			if (!handle.IsValid())
@@ -73,7 +73,7 @@ namespace Memory
 			}
 		}
 
-		if (DoesFileExist("chaosmod\\.blacklistedhooks"))
+		if (DoesFeatureFlagExist("blacklistedhooks"))
 		{
 			std::ifstream file("chaosmod\\.blacklistedhooks");
 			if (!file.fail())

diff --git a/ChaosMod/Util/CrashHandler.h b/ChaosMod/Util/CrashHandler.h
@@ -11,7 +11,7 @@
 
 inline LONG WINAPI CrashHandler(_EXCEPTION_POINTERS *exceptionInfo)
 {
-	if (DoesFileExist("chaosmod\\.nodumps"))
+	if (DoesFeatureFlagExist("nodumps"))
 	{
 		return EXCEPTION_CONTINUE_SEARCH;
 	}
@@ -37,7 +37,7 @@ inline LONG WINAPI CrashHandler(_EXCEPTION_POINTERS *exceptionInfo)
 
 	DWORD flags              = MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory;
 
-	if (DoesFileExist("chaosmod\\.fulldumps"))
+	if (DoesFeatureFlagExist("fulldumps"))
 	{
 		flags = MiniDumpWithFullMemory | MiniDumpWithHandleData | MiniDumpWithUnloadedModules
 		      | MiniDumpWithProcessThreadData | MiniDumpWithFullMemoryInfo | MiniDumpWithThreadInfo;

diff --git a/ChaosMod/Util/File.h b/ChaosMod/Util/File.h
@@ -14,6 +14,11 @@ inline bool DoesFileExist(std::string_view fileName)
 	return stat(fileName.data(), &temp) == 0;
 }
 
+inline bool DoesFeatureFlagExist(const std::string &featureFlagName)
+{
+	return DoesFileExist("chaosmod\\." + featureFlagName);
+}
+
 inline std::vector<std::filesystem::directory_entry> GetFiles(std::string path, std::string extension, bool recursive,
                                                               std::vector<std::string> blacklistedFiles = {})
 {