From 4ea4f931cc098352775416e52b4ab45046fd16a1 Mon Sep 17 00:00:00 2001 From: Ilya Orlov Date: Mon, 20 Aug 2018 16:06:36 +0300 Subject: [PATCH] Common: fixed all found call xrCore::Initialize() --- src/editors/xrEditor/entry_point.cpp | 2 +- src/editors/xrManagedApi/core/Core.cpp | 3 +-- src/plugins/Max/Export/MeshExpPlugin.cpp | 2 +- src/plugins/Max/Material/DllEntry.cpp | 2 +- src/plugins/Maya/Export/XRayExport.cpp | 2 +- src/plugins/Maya/Material/lambertShader.cpp | 2 +- src/plugins/lw/Export/LW_export_motion.cpp | 2 +- src/plugins/lw/Export/LW_export_object.cpp | 2 +- src/utils/mp_balancer/entry_point.cpp | 2 +- src/utils/mp_configs_verifyer/entry_point.cpp | 2 +- src/utils/mp_screenshots_info/entry_point.cpp | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/editors/xrEditor/entry_point.cpp b/src/editors/xrEditor/entry_point.cpp index 22724639ee2..0555e41c664 100644 --- a/src/editors/xrEditor/entry_point.cpp +++ b/src/editors/xrEditor/entry_point.cpp @@ -22,7 +22,7 @@ void UIThreadProc(void*) auto windowIDE = gcnew WindowIDE(); - Core.Initialize("OpenXRayEditor", LogCallback(ELogCallback, windowIDE->Log().Handle.ToPointer()), true); + Core.Initialize("OpenXRayEditor", nullptr, LogCallback(ELogCallback, windowIDE->Log().Handle.ToPointer()), true); #ifdef XR_X64 Device.m_sdlWnd = (SDL_Window*)windowIDE->View().GetViewHandle().ToInt64(); diff --git a/src/editors/xrManagedApi/core/Core.cpp b/src/editors/xrManagedApi/core/Core.cpp index e6fd29d6add..c7450f057f9 100644 --- a/src/editors/xrManagedApi/core/Core.cpp +++ b/src/editors/xrManagedApi/core/Core.cpp @@ -24,8 +24,7 @@ void Core::Initialize(String ^ appName, LogCallback ^ logCallback, bool initFs, if (fsFileName) { std::string fsFileNameC = msclr::interop::marshal_as(fsFileName); - ::Core.Initialize( - appNameC.c_str(), nullptr ,::LogCallback(LogCallbackWrapper, nullptr), initFs, fsFileNameC.c_str()); + ::Core.Initialize(appNameC.c_str(), nullptr ,::LogCallback(LogCallbackWrapper, nullptr), initFs, fsFileNameC.c_str()); } else ::Core.Initialize(appNameC.c_str(), nullptr, ::LogCallback(LogCallbackWrapper, nullptr), initFs, nullptr); diff --git a/src/plugins/Max/Export/MeshExpPlugin.cpp b/src/plugins/Max/Export/MeshExpPlugin.cpp index 6f362aaed65..c942fdb657c 100644 --- a/src/plugins/Max/Export/MeshExpPlugin.cpp +++ b/src/plugins/Max/Export/MeshExpPlugin.cpp @@ -34,7 +34,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, ULONG fdwReason, LPVOID lpvReserved) if (!controlsInit) { controlsInit = TRUE; - Core.Initialize("S.T.A.L.K.E.R.Plugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); + Core.Initialize("S.T.A.L.K.E.R.Plugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx"); FPU::m64r(); // нужно чтобы макс не сбрасывал контрольки в 0 InitCustomControls(hInstance); diff --git a/src/plugins/Max/Material/DllEntry.cpp b/src/plugins/Max/Material/DllEntry.cpp index 95f6480d8c0..ce55620c61f 100644 --- a/src/plugins/Max/Material/DllEntry.cpp +++ b/src/plugins/Max/Material/DllEntry.cpp @@ -16,7 +16,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, ULONG fdwReason, LPVOID lpvReserved) if (!controlsInit) { controlsInit = TRUE; - Core.Initialize("S.T.A.L.K.E.R.Plugin", 0, FALSE, nullptr, true); + Core.Initialize("S.T.A.L.K.E.R.Plugin", nullptr, 0, FALSE, nullptr, true); FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx"); FPU::m64r(); // нужно чтобы макс не сбрасывал контрольки в 0 InitCustomControls(hInstance); // Initialize MAX's custom controls diff --git a/src/plugins/Maya/Export/XRayExport.cpp b/src/plugins/Maya/Export/XRayExport.cpp index 553b2ba0b4a..baa0ad0f498 100644 --- a/src/plugins/Maya/Export/XRayExport.cpp +++ b/src/plugins/Maya/Export/XRayExport.cpp @@ -44,7 +44,7 @@ void uninitialize(void*) MStatus initializePlugin(MObject obj) { INIT_OBJ = obj; - Core.Initialize("XRayMayaPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); + Core.Initialize("XRayMayaPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx"); MFnPlugin plugin(obj, "GSC Game World", "1.00", "Any"); diff --git a/src/plugins/Maya/Material/lambertShader.cpp b/src/plugins/Maya/Material/lambertShader.cpp index 532b30995ff..8dc8f406401 100644 --- a/src/plugins/Maya/Material/lambertShader.cpp +++ b/src/plugins/Maya/Material/lambertShader.cpp @@ -935,7 +935,7 @@ MStatus initializePlugin(MObject obj) INIT_OBJ = obj; const MString UserClassify("shader/surface"); - Core.Initialize("XRayMayaPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); + Core.Initialize("XRayMayaPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx"); MString command("if( `window -exists createRenderNodeWindow` ) {refreshCreateRenderNodeWindow(\""); diff --git a/src/plugins/lw/Export/LW_export_motion.cpp b/src/plugins/lw/Export/LW_export_motion.cpp index 112336b6831..cb0a3278640 100644 --- a/src/plugins/lw/Export/LW_export_motion.cpp +++ b/src/plugins/lw/Export/LW_export_motion.cpp @@ -29,7 +29,7 @@ extern "C" { //----------------------------------------------------------------------------------------- void __cdecl SaveObjectMotion(GlobalFunc* global) { - Core.Initialize("XRayPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); + Core.Initialize("XRayPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx"); // get bone ID bool bErr = false; diff --git a/src/plugins/lw/Export/LW_export_object.cpp b/src/plugins/lw/Export/LW_export_object.cpp index 3c248c5fc59..f9c9d863dac 100644 --- a/src/plugins/lw/Export/LW_export_object.cpp +++ b/src/plugins/lw/Export/LW_export_object.cpp @@ -108,7 +108,7 @@ extern "C" { //----------------------------------------------------------------------------------------- void __cdecl SaveObject(GlobalFunc* global) { - Core.Initialize("XRayPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); + Core.Initialize("XRayPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true); FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx"); // get bone ID diff --git a/src/utils/mp_balancer/entry_point.cpp b/src/utils/mp_balancer/entry_point.cpp index 8d320cefd71..5ac616eecc2 100644 --- a/src/utils/mp_balancer/entry_point.cpp +++ b/src/utils/mp_balancer/entry_point.cpp @@ -5,7 +5,7 @@ void main(int argc, char* argv[]) { xrDebug::Initialize(false); - Core.Initialize("mp_ballancer", NULL, TRUE, "fsgame.ltx"); + Core.Initialize("mp_ballancer", nullptr, NULL, TRUE, "fsgame.ltx"); SetConsoleOutputCP(1251); diff --git a/src/utils/mp_configs_verifyer/entry_point.cpp b/src/utils/mp_configs_verifyer/entry_point.cpp index 962e82ffab8..5b7e6b5991d 100644 --- a/src/utils/mp_configs_verifyer/entry_point.cpp +++ b/src/utils/mp_configs_verifyer/entry_point.cpp @@ -146,7 +146,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", nullptr, LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx"); string_path fname; FS.update_path(fname, "$game_config$", "system.ltx"); diff --git a/src/utils/mp_screenshots_info/entry_point.cpp b/src/utils/mp_screenshots_info/entry_point.cpp index 9c46d608c90..2c0abb10119 100644 --- a/src/utils/mp_screenshots_info/entry_point.cpp +++ b/src/utils/mp_screenshots_info/entry_point.cpp @@ -67,7 +67,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", nullptr, LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx"); #ifdef DEBUG if (strstr(argv[1], "--gen_params"))