refactor: rework config system

src/common/branding.h

@@ -1,8 +1,6 @@
 #pragma once
 
-#include <cstdio>
-#include "version.h"
-
+#include "config.h"
 namespace branding
 {
 enum Game
@@ -52,7 +50,17 @@ inline const char *GetBrandingString(Game game, Mode mode)
         break;
     }
 
-    _snprintf_s(brandingBuffer, sizeof(brandingBuffer), "CoDxe - %s %s " __DATE__ " " __TIME__, gameName, modeName);
+    if (Config::active_mod.empty())
+    {
+        _snprintf_s(brandingBuffer, sizeof(brandingBuffer), "CoDxe - %s %s\nBuild: " __DATE__ " " __TIME__, gameName,
+                    modeName);
+    }
+    else
+    {
+        _snprintf_s(brandingBuffer, sizeof(brandingBuffer),
+                    "CoDxe - %s %s\nBuild: " __DATE__ " " __TIME__ "\nActive mod: %s", gameName, modeName,
+                    Config::active_mod.c_str());
+    }
 
     return brandingBuffer;
 }

src/common/config.cpp

@@ -9,6 +9,11 @@ const char *CONFIG_PATH = "game:\\_codxe\\codxe.json";
 const char *MOD_DIR = "game:\\_codxe\\mods";
 const char *DUMP_DIR = "game:\\_codxe\\dump";
 
+// Default values
+std::string Config::active_mod = "";
+bool Config::dump_rawfile = false;
+bool Config::dump_map_ents = false;
+
 bool DirectoryExists(const char *path)
 {
     DWORD attrs = GetFileAttributesA(path);
@@ -37,15 +42,26 @@ bool ReadFileToString(const char *path, std::string &outString)
     return file.read(&outString[0], size).good();
 }
 
-void DbgPrintConfig(const Config &config)
+Config::Config()
+{
+    DbgPrint("[codxe][Config] Loading configuration from: %s\n", CONFIG_PATH);
+
+    if (!LoadFromFile(CONFIG_PATH))
+    {
+        DbgPrint("[codxe][Config] Failed to load config file, using defaults\n");
+    }
+}
+
+Config::~Config()
 {
-    DbgPrint("Configuration:\n");
-    DbgPrint("Active Mod: %s\n", config.active_mod.c_str());
-    DbgPrint("Dump Raw Scripts: %s\n", config.dump_raw ? "true" : "false");
-    DbgPrint("Dump Map Entities: %s\n", config.dump_map_ents ? "true" : "false");
+    // Reset to defaults on cleanup
+    active_mod = "";
+    dump_rawfile = false;
+    dump_map_ents = false;
+    DbgPrint("[codxe][Config] Configuration unloaded\n");
 }
 
-bool LoadConfigFromJson(const char *jsonBuffer, DWORD bufferSize, Config &outConfig)
+bool Config::LoadFromJson(const char *jsonBuffer, DWORD bufferSize)
 {
     HJSONREADER hJsonReader = XJSONCreateReader();
     if (!hJsonReader)
@@ -78,35 +94,55 @@ bool LoadConfigFromJson(const char *jsonBuffer, DWORD bufferSize, Config &outCon
                 XJSONGetTokenValue(hJsonReader, valueBuffer, ARRAYSIZE(valueBuffer));
                 char narrowValue[256];
                 wcstombs(narrowValue, valueBuffer, sizeof(narrowValue));
-                outConfig.active_mod = narrowValue;
+                active_mod = narrowValue;
             }
-            else if (wcscmp(propertyName, L"dump_raw") == 0)
+            else if (wcscmp(propertyName, L"dump_rawfile") == 0)
             {
-                outConfig.dump_raw = (jsonTokenType == Json_True);
+                dump_rawfile = (jsonTokenType == Json_True);
             }
             else if (wcscmp(propertyName, L"dump_map_ents") == 0)
             {
-                outConfig.dump_map_ents = (jsonTokenType == Json_True);
+                dump_map_ents = (jsonTokenType == Json_True);
             }
             else
             {
-                DbgPrint("WARNING: Ignoring unknown property in config: %ls\n", propertyName);
+                DbgPrint("[codxe][Config] WARNING: Ignoring unknown property: %ls\n", propertyName);
             }
         }
     }
 
     XJSONCloseReader(hJsonReader);
 
-    DbgPrintConfig(outConfig);
+    DbgPrint("[codxe][Config] Configuration loaded:\n");
+    DbgPrint("  Active Mod: %s\n", active_mod.c_str());
+    DbgPrint("  Dump Raw Scripts: %s\n", dump_rawfile ? "true" : "false");
+    DbgPrint("  Dump Map Entities: %s\n", dump_map_ents ? "true" : "false");
 
     return true;
 }
 
-bool LoadConfigFromFile(const char *path, Config &outConfig)
+bool Config::LoadFromFile(const char *path)
 {
     std::string jsonContent;
     if (!ReadFileToString(path, jsonContent))
         return false;
 
-    return LoadConfigFromJson(jsonContent.c_str(), static_cast<DWORD>(jsonContent.size()), outConfig);
+    return LoadFromJson(jsonContent.c_str(), static_cast<DWORD>(jsonContent.size()));
+}
+
+// Helper method - requires logic beyond simple field access
+std::string Config::GetModBasePath()
+{
+    if (active_mod.empty())
+    {
+        return "";
+    }
+
+    std::string mod_base_path = std::string(MOD_DIR) + "\\" + active_mod;
+    if (!DirectoryExists(mod_base_path.c_str()))
+    {
+        DbgPrint("[codxe][Config] Active mod directory does not exist: %s\n", mod_base_path.c_str());
+        return "";
+    }
+    return mod_base_path;
 }

src/common/config.h

@@ -10,30 +10,24 @@ bool DirectoryExists(const char *path);
 bool FileExists(const char *path);
 bool ReadFileToString(const char *path, std::string &outString);
 
-struct Config
+class Config : public Module
 {
-    std::string active_mod;
-    bool dump_raw;
-    bool dump_map_ents;
+  public:
+    Config();
+    ~Config();
 
-    Config()
+    const char *get_name() override
     {
-        active_mod = "";
-        dump_raw = false;
-        dump_map_ents = false;
+        return "Config";
     }
 
-    std::string GetModBasePath()
-    {
-        std::string mod_base_path = std::string(MOD_DIR) + "\\" + active_mod;
-        if (!DirectoryExists(mod_base_path.c_str()))
-        {
-            DbgPrint("Config: Active mod directory does not exist: %s\n", mod_base_path.c_str());
-            return "";
-        }
-        return mod_base_path;
-    }
-};
+    static std::string active_mod;
+    static bool dump_rawfile;
+    static bool dump_map_ents;
 
-bool LoadConfigFromJson(const char *jsonBuffer, DWORD bufferSize, Config &outConfig);
-bool LoadConfigFromFile(const char *path, Config &outConfig);
+    static std::string GetModBasePath();
+
+  private:
+    bool LoadFromJson(const char *jsonBuffer, DWORD bufferSize);
+    bool LoadFromFile(const char *path);
+};

src/game/iw2/mp/components/scr_parser.cpp

@@ -15,10 +15,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
                                                                                        archive);
     };
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    if (config.dump_raw)
+    if (Config::dump_rawfile)
     {
         DbgPrint("GSCLoader: Dumping script %s\n", extFilename);
         auto contents = callOriginal();
@@ -35,7 +32,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
     }
 
     // Check if mod is active
-    std::string modBasePath = config.GetModBasePath();
+    std::string modBasePath = Config::GetModBasePath();
     if (modBasePath.empty())
         return callOriginal();
 

src/game/iw2/mp/main.cpp

@@ -10,6 +10,7 @@ namespace mp
 IW2_MP_Plugin::IW2_MP_Plugin()
 {
     DbgPrint("IW2 MP Plugin initialized\n");
+    RegisterModule(new Config());
     RegisterModule(new scr_parser());
 }
 

src/game/iw2/sp/components/scr_parser.cpp

@@ -15,10 +15,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
                                                                                        archive);
     };
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    if (config.dump_raw)
+    if (Config::dump_rawfile)
     {
         DbgPrint("GSCLoader: Dumping script %s\n", extFilename);
         auto contents = callOriginal();
@@ -35,7 +32,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
     }
 
     // Check if mod is active
-    std::string modBasePath = config.GetModBasePath();
+    std::string modBasePath = Config::GetModBasePath();
     if (modBasePath.empty())
         return callOriginal();
 

src/game/iw2/sp/main.cpp

@@ -10,6 +10,7 @@ namespace sp
 IW2_SP_Plugin::IW2_SP_Plugin()
 {
     DbgPrint("IW2 SP Plugin initialized\n");
+    RegisterModule(new Config());
     this->RegisterModule(new scr_parser());
 }
 

src/game/iw3/mp/components/cmds.cpp

@@ -121,11 +121,8 @@ bool Cmd_ExecFromFastFile_Hook(int localClientNum, int controllerIndex, const ch
                                                                                          controllerIndex, filename);
     };
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
     // Check if mod is active
-    std::string modBasePath = config.GetModBasePath();
+    std::string modBasePath = Config::GetModBasePath();
     if (modBasePath.empty())
         return callOriginal();
 

src/game/iw3/mp/components/scr_parser.cpp

@@ -15,10 +15,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
                                                                                        archive);
     };
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    if (config.dump_raw)
+    if (Config::dump_rawfile)
     {
         DbgPrint("GSCLoader: Dumping script %s\n", extFilename);
         auto contents = callOriginal();
@@ -35,7 +32,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
     }
 
     // Check if mod is active
-    std::string modBasePath = config.GetModBasePath();
+    std::string modBasePath = Config::GetModBasePath();
     if (modBasePath.empty())
         return callOriginal();
 

src/game/iw3/mp/main.cpp

@@ -9,6 +9,7 @@
 #include "components/pm.h"
 #include "components/scr_parser.h"
 #include "components/scr_vm_functions.h"
+#include "common/config.h"
 
 // Structure to hold data for the active keyboard request
 struct KeyboardRequest
@@ -391,12 +392,10 @@ void Load_MapEntsPtr_Hook()
         std::replace(file_path.begin(), file_path.end(), '/', '\\'); // Replace forward slashes with backslashes
         filesystem::write_file_to_disk(file_path.c_str(), mapEnts->entityString, mapEnts->numEntityChars);
 
-        Config config;
-        LoadConfigFromFile(CONFIG_PATH, config);
-
+        // Use new ConfigModule API
         // Load map ents from file
         // Path to check for existing entity file
-        std::string raw_file_path = config.GetModBasePath();
+        std::string raw_file_path = Config::GetModBasePath();
 
         raw_file_path += std::string("\\") + mapEnts->name;
         raw_file_path += ".ents";                                            // IW4x naming convention
@@ -465,10 +464,8 @@ bool R_StreamLoadHighMipReplacement(const char *filename, unsigned int bytesToRe
 
     auto image = asset->entry.asset.header.image;
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    std::string replacement_path = config.GetModBasePath() + "\\highmip" + "\\" + asset_name + ".dds";
+    // Use new ConfigModule API
+    std::string replacement_path = Config::GetModBasePath() + "\\highmip" + "\\" + asset_name + ".dds";
     std::ifstream file(replacement_path, std::ios::binary | std::ios::ate);
     if (!file)
     {
@@ -1202,10 +1199,7 @@ void Image_Replace_Cube(GfxImage *image, const DDSImage &ddsImage)
 
 void Image_Replace(GfxImage *image)
 {
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    const std::string replacement_base_dir = config.GetModBasePath() + "\\images";
+    const std::string replacement_base_dir = Config::GetModBasePath() + "\\images";
     const std::string replacement_path = replacement_base_dir + "\\" + image->name + ".dds";
 
     if (!filesystem::file_exists(replacement_path))
@@ -1539,6 +1533,8 @@ IW3_MP_Plugin::IW3_MP_Plugin()
 {
     DbgPrint("Initializing MP\n");
 
+    RegisterModule(new Config());
+
     RegisterModule(new cg());
     RegisterModule(new cj_tas());
     RegisterModule(new clipmap());

src/game/iw3/sp/components/scr_parser.cpp

@@ -15,10 +15,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
                                                                                        archive);
     };
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    if (config.dump_raw)
+    if (Config::dump_rawfile)
     {
         DbgPrint("GSCLoader: Dumping script %s\n", extFilename);
         auto contents = callOriginal();
@@ -35,7 +32,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename, co
     }
 
     // Check if mod is active
-    std::string modBasePath = config.GetModBasePath();
+    std::string modBasePath = Config::GetModBasePath();
     if (modBasePath.empty())
         return callOriginal();
 

src/game/iw3/sp/main.cpp

@@ -142,6 +142,7 @@ void Cmd_Dumpraw_f()
 IW3_SP_Plugin::IW3_SP_Plugin()
 {
     DbgPrint("IW3 SP: Plugin loaded\n");
+    RegisterModule(new Config());
     RegisterModule(new scr_parser());
 
     CL_GamepadButtonEvent_Detour = Detour(CL_GamepadButtonEvent, CL_GamepadButtonEvent_Hook);

src/game/iw4/mp/components/scr_parser.cpp

@@ -12,10 +12,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename)
     auto callOriginal = [&]()
     { return Scr_AddSourceBuffer_Detour.GetOriginal<decltype(Scr_AddSourceBuffer)>()(filename, extFilename); };
 
-    Config config;
-    LoadConfigFromFile(CONFIG_PATH, config);
-
-    if (config.dump_raw)
+    if (Config::dump_rawfile)
     {
         auto contents = callOriginal();
         // Dump the script to a file
@@ -27,7 +24,7 @@ char *Scr_AddSourceBuffer_Hook(const char *filename, const char *extFilename)
     }
 
     // Check if mod is active
-    std::string modBasePath = config.GetModBasePath();
+    std::string modBasePath = Config::GetModBasePath();
     if (modBasePath.empty())
         return callOriginal();
 

src/game/iw4/mp/main.cpp

@@ -19,6 +19,7 @@ IW4_MP_Plugin::IW4_MP_Plugin()
 {
 
     DbgPrint("IW4 MP: Registering modules\n");
+    RegisterModule(new Config());
     RegisterModule(new Events()); // Must be registered first to ensure hooks are in place
     RegisterModule(new cg());
     RegisterModule(new clipmap());