Skip to content

Commit 4ea4f93

Browse files
committed
Common: fixed all found call xrCore::Initialize()
1 parent 779c065 commit 4ea4f93

File tree

11 files changed

+11
-12
lines changed

11 files changed

+11
-12
lines changed

src/editors/xrEditor/entry_point.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void UIThreadProc(void*)
2222

2323
auto windowIDE = gcnew WindowIDE();
2424

25-
Core.Initialize("OpenXRayEditor", LogCallback(ELogCallback, windowIDE->Log().Handle.ToPointer()), true);
25+
Core.Initialize("OpenXRayEditor", nullptr, LogCallback(ELogCallback, windowIDE->Log().Handle.ToPointer()), true);
2626

2727
#ifdef XR_X64
2828
Device.m_sdlWnd = (SDL_Window*)windowIDE->View().GetViewHandle().ToInt64();

src/editors/xrManagedApi/core/Core.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ void Core::Initialize(String ^ appName, LogCallback ^ logCallback, bool initFs,
2424
if (fsFileName)
2525
{
2626
std::string fsFileNameC = msclr::interop::marshal_as<std::string>(fsFileName);
27-
::Core.Initialize(
28-
appNameC.c_str(), nullptr ,::LogCallback(LogCallbackWrapper, nullptr), initFs, fsFileNameC.c_str());
27+
::Core.Initialize(appNameC.c_str(), nullptr ,::LogCallback(LogCallbackWrapper, nullptr), initFs, fsFileNameC.c_str());
2928
}
3029
else
3130
::Core.Initialize(appNameC.c_str(), nullptr, ::LogCallback(LogCallbackWrapper, nullptr), initFs, nullptr);

src/plugins/Max/Export/MeshExpPlugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, ULONG fdwReason, LPVOID lpvReserved)
3434
if (!controlsInit)
3535
{
3636
controlsInit = TRUE;
37-
Core.Initialize("S.T.A.L.K.E.R.Plugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
37+
Core.Initialize("S.T.A.L.K.E.R.Plugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
3838
FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx");
3939
FPU::m64r(); // нужно чтобы макс не сбрасывал контрольки в 0
4040
InitCustomControls(hInstance);

src/plugins/Max/Material/DllEntry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, ULONG fdwReason, LPVOID lpvReserved)
1616
if (!controlsInit)
1717
{
1818
controlsInit = TRUE;
19-
Core.Initialize("S.T.A.L.K.E.R.Plugin", 0, FALSE, nullptr, true);
19+
Core.Initialize("S.T.A.L.K.E.R.Plugin", nullptr, 0, FALSE, nullptr, true);
2020
FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx");
2121
FPU::m64r(); // нужно чтобы макс не сбрасывал контрольки в 0
2222
InitCustomControls(hInstance); // Initialize MAX's custom controls

src/plugins/Maya/Export/XRayExport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void uninitialize(void*)
4444
MStatus initializePlugin(MObject obj)
4545
{
4646
INIT_OBJ = obj;
47-
Core.Initialize("XRayMayaPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
47+
Core.Initialize("XRayMayaPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
4848
FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx");
4949

5050
MFnPlugin plugin(obj, "GSC Game World", "1.00", "Any");

src/plugins/Maya/Material/lambertShader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ MStatus initializePlugin(MObject obj)
935935
INIT_OBJ = obj;
936936
const MString UserClassify("shader/surface");
937937

938-
Core.Initialize("XRayMayaPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
938+
Core.Initialize("XRayMayaPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
939939
FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx");
940940

941941
MString command("if( `window -exists createRenderNodeWindow` ) {refreshCreateRenderNodeWindow(\"");

src/plugins/lw/Export/LW_export_motion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929
//-----------------------------------------------------------------------------------------
3030
void __cdecl SaveObjectMotion(GlobalFunc* global)
3131
{
32-
Core.Initialize("XRayPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
32+
Core.Initialize("XRayPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
3333
FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx");
3434
// get bone ID
3535
bool bErr = false;

src/plugins/lw/Export/LW_export_object.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ extern "C" {
108108
//-----------------------------------------------------------------------------------------
109109
void __cdecl SaveObject(GlobalFunc* global)
110110
{
111-
Core.Initialize("XRayPlugin", LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
111+
Core.Initialize("XRayPlugin", nullptr, LogCallback(ELogCallback, nullptr), FALSE, nullptr, true);
112112
FS._initialize(CLocatorAPI::flScanAppRoot, NULL, "xray_path.ltx");
113113

114114
// get bone ID

src/utils/mp_balancer/entry_point.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
void main(int argc, char* argv[])
66
{
77
xrDebug::Initialize(false);
8-
Core.Initialize("mp_ballancer", NULL, TRUE, "fsgame.ltx");
8+
Core.Initialize("mp_ballancer", nullptr, NULL, TRUE, "fsgame.ltx");
99

1010
SetConsoleOutputCP(1251);
1111

src/utils/mp_configs_verifyer/entry_point.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void run_configs_verifyer_server()
146146

147147
void initialize_core()
148148
{
149-
Core.Initialize("mp_configs_info", LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx");
149+
Core.Initialize("mp_configs_info", nullptr, LogCallback(xrcore_log_cb, nullptr), TRUE, "fsgame4mpu.ltx");
150150

151151
string_path fname;
152152
FS.update_path(fname, "$game_config$", "system.ltx");

0 commit comments

Comments
 (0)