xrCore refactoring

Author: Xottab-DUTY

src/utils/ETools/ETools.cpp

@@ -10,7 +10,7 @@ BOOL APIENTRY DllMain(HANDLE hModule, DWORD fdwReason, LPVOID lpReserved)
     {
     case DLL_PROCESS_ATTACH:
         xrDebug::Initialize(false);
-        Core._initialize("XRayEditorTools", 0, FALSE);
+        Core.Initialize("XRayEditorTools", 0, FALSE);
         // FPU::m64r	();
         break;
     case DLL_THREAD_ATTACH: break;

src/utils/mp_configs_verifyer/entry_point.cpp

@@ -148,7 +148,7 @@ void run_configs_verifyer_server()
 
 void initialize_core()
 {
-    Core._initialize("mp_configs_info", LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx");
+    Core.Initialize("mp_configs_info", LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx");
 
     string_path fname;
     FS.update_path(fname, "$game_config$", "system.ltx");

src/utils/mp_screenshots_info/entry_point.cpp

@@ -69,7 +69,7 @@ int main(int argc, char** argv)
         return EXIT_FAILURE;
     }
     printf("Initializing core...\n");
-    Core._initialize("mp_screenshots_info", LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx");
+    Core.Initialize("mp_screenshots_info", LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx");
 
 #ifdef DEBUG
     if (strstr(argv[1], "--gen_params"))

src/utils/xrAI/xrAI.cpp

@@ -197,7 +197,7 @@ Factory_Destroy* destroy_entity = 0;
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
     xrDebug::Initialize(false);
-    Core._initialize("xrai", 0);
+    Core.Initialize("xrai", 0);
     HMODULE hFactory;
     LPCSTR g_name = "xrSE_Factory";
     Log("Loading DLL:", g_name);

src/utils/xrCompress/main.cpp

@@ -8,7 +8,7 @@ extern int ProcessDifference();
 int __cdecl main(int argc, char* argv[])
 {
     xrDebug::Initialize(false);
-    Core._initialize("xrCompress", 0, FALSE);
+    Core.Initialize("xrCompress", 0, FALSE);
     printf("\n\n");
 
     LPCSTR params = GetCommandLine();

src/utils/xrDO_Light/xrDO_Light.cpp

@@ -90,7 +90,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 {
     // Initialize debugging
     xrDebug::Initialize(false);
-    Core._initialize("xrDO");
+    Core.Initialize("xrDO");
     Startup(lpCmdLine);
 
     return 0;

src/utils/xrLC/xrLC.cpp

@@ -155,7 +155,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
 {
     // Initialize debugging
     xrDebug::Initialize(false);
-    Core._initialize("xrLC");
+    Core.Initialize("xrLC");
 
     if (strstr(Core.Params, "-nosmg"))
         g_using_smooth_groups = false;

src/utils/xrLC_Light/xrLC_Light.cpp

@@ -24,7 +24,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
     {
         xrDebug::Initialize(false);
         bool init_log = (0 != xr_strcmp(Core.ApplicationName, "XRayEditorTools"));
-        Core._initialize("xrLC_Light", 0, FALSE);
+        Core.Initialize("xrLC_Light", 0, FALSE);
         if (init_log)
             CreateLog();
 

src/utils/xrSE_Factory/xrSE_Factory.cpp

@@ -54,7 +54,7 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved)
         //          g_temporary_stuff           = &trivial_encryptor::decode;
 
         Debug._initialize(false);
-        Core._initialize("xrSE_Factory", NULL, TRUE, "fsfactory.ltx");
+        Core.Initialize("xrSE_Factory", NULL, TRUE, "fsfactory.ltx");
         string_path SYSTEM_LTX;
         FS.update_path(SYSTEM_LTX, "$game_config$", "system.ltx");
         pSettings = xr_new<CInifile>(SYSTEM_LTX);

src/xrCore/xrCore.cpp

@@ -26,7 +26,7 @@ static u32 init_counter = 0;
 
 //. extern xr_vector<shared_str>* LogFile;
 
-void xrCore::_initialize(LPCSTR _ApplicationName, LogCallback cb, BOOL init_fs, LPCSTR fs_fname, bool plugin)
+void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pcstr fs_fname, bool plugin)
 {
     xr_strcpy(ApplicationName, _ApplicationName);
     if (0 == init_counter)
@@ -36,13 +36,13 @@ void xrCore::_initialize(LPCSTR _ApplicationName, LogCallback cb, BOOL init_fs,
         // HRESULT co_res =
         Params = xr_strdup(GetCommandLine());
         if (!strstr(Params, "-editor"))
-            CoInitializeEx(NULL, COINIT_MULTITHREADED);
+            CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 
         string_path fn, dr, di;
 
         // application path
         GetModuleFileName(GetModuleHandle("xrCore"), fn, sizeof(fn));
-        _splitpath(fn, dr, di, 0, 0);
+        _splitpath(fn, dr, di, nullptr, nullptr);
         strconcat(sizeof(ApplicationPath), ApplicationPath, dr, di);
 
 #ifdef _EDITOR
@@ -87,10 +87,10 @@ void xrCore::_initialize(LPCSTR _ApplicationName, LogCallback cb, BOOL init_fs,
     }
     if (init_fs)
     {
-        u32 flags = 0;
-        if (0 != strstr(Params, "-build"))
+        u32 flags = 0u;
+        if (strstr(Params, "-build") != nullptr)
             flags |= CLocatorAPI::flBuildCopy;
-        if (0 != strstr(Params, "-ebuild"))
+        if (strstr(Params, "-ebuild") != nullptr)
             flags |= CLocatorAPI::flBuildCopy | CLocatorAPI::flEBuildCopy;
 #ifdef DEBUG
         if (strstr(Params, "-cache"))
@@ -105,11 +105,11 @@ void xrCore::_initialize(LPCSTR _ApplicationName, LogCallback cb, BOOL init_fs,
 
 #ifndef _EDITOR
 #ifndef ELocatorAPIH
-        if (0 != strstr(Params, "-file_activity"))
+        if (strstr(Params, "-file_activity") != nullptr)
             flags |= CLocatorAPI::flDumpFileActivity;
 #endif
 #endif
-        FS._initialize(flags, 0, fs_fname);
+        FS._initialize(flags, nullptr, fs_fname);
         CalculateBuildId();
         Msg("'%s' build %d, %s\n", "xrCore", buildId, buildDate);
         EFS._initialize();
@@ -201,7 +201,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD ul_reason_for_call, LPVOID lpvRese
     break;
     case DLL_THREAD_ATTACH:
         if (!strstr(GetCommandLine(), "-editor"))
-            CoInitializeEx(NULL, COINIT_MULTITHREADED);
+            CoInitializeEx(nullptr, COINIT_MULTITHREADED);
         timeBeginPeriod(1);
         break;
     case DLL_THREAD_DETACH: break;