Merge remote-tracking branch 'intorr/intorr_dev' into xd_dev

OpenXRay · Mar 17, 2018 · fd363b4 · fd363b4
2 parents f2a6a3d + bd50031
commit fd363b4
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/src/xrCore/FileSystem.cpp b/src/xrCore/FileSystem.cpp
@@ -9,7 +9,7 @@
 #include "commdlg.h"
 #include "vfw.h"
 
-EFS_Utils* xr_EFS = NULL;
+std::unique_ptr<EFS_Utils> xr_EFS;
 //----------------------------------------------------
 EFS_Utils::EFS_Utils() {}
 EFS_Utils::~EFS_Utils() {}

diff --git a/src/xrCore/FileSystem.h b/src/xrCore/FileSystem.h
@@ -42,7 +42,7 @@ class XRCORE_API EFS_Utils
     static xr_string ExtractFileExt(LPCSTR src);
     static xr_string ExcludeBasePath(LPCSTR full_path, LPCSTR excl_path);
 };
-extern XRCORE_API EFS_Utils* xr_EFS;
+extern XRCORE_API std::unique_ptr<EFS_Utils> xr_EFS;
 #define EFS (*xr_EFS)
 
 #endif /*_INCDEF_FileSystem_H_*/
diff --git a/src/xrCore/LocatorAPI.cpp b/src/xrCore/LocatorAPI.cpp
@@ -19,7 +19,7 @@
 
 const u32 BIG_FILE_READER_WINDOW_SIZE = 1024 * 1024;
 
-CLocatorAPI* xr_FS = nullptr;
+std::unique_ptr<CLocatorAPI> xr_FS;
 
 #ifdef _EDITOR
 static constexpr pcstr FSLTX = "fs.ltx"

diff --git a/src/xrCore/LocatorAPI.h b/src/xrCore/LocatorAPI.h
@@ -212,5 +212,5 @@ class XRCORE_API CLocatorAPI : Noncopyable
     void unlock_rescan();
 };
 
-extern XRCORE_API CLocatorAPI* xr_FS;
+extern XRCORE_API std::unique_ptr<CLocatorAPI> xr_FS;
 #define FS (*xr_FS)
diff --git a/src/xrCore/cpuid.cpp b/src/xrCore/cpuid.cpp
@@ -46,7 +46,7 @@ unsigned int query_processor_info(processor_info* pinfo)
     std::bitset<32> f_81_ECX;*/
     std::bitset<32> f_81_EDX;
 
-    std::vector<std::array<int, 4>> data;
+    xr_vector<std::array<int, 4>> data;
     std::array<int, 4> cpui;
 
     __cpuid(cpui.data(), 0);

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -82,9 +82,9 @@ void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pc
 
         rtc_initialize();
 
-        xr_FS = new CLocatorAPI();
+        xr_FS = std::make_unique<CLocatorAPI>();
 
-        xr_EFS = new EFS_Utils();
+        xr_EFS = std::make_unique<EFS_Utils>();
         //. R_ASSERT (co_res==S_OK);
     }
     if (init_fs)
@@ -135,8 +135,8 @@ void xrCore::_destroy()
         ttapi.destroy();
         FS._destroy();
         EFS._destroy();
-        xr_delete(xr_FS);
-        xr_delete(xr_EFS);
+        xr_FS.reset();
+        xr_EFS.reset();
 
 #ifndef _EDITOR
         if (trained_model)

diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -281,7 +281,6 @@ ENGINE_API int RunApplication()
 
     Engine.External.Initialize();
     Startup();
-    Core._destroy();
     // check for need to execute something external
     if (/*xr_strlen(g_sLaunchOnExit_params) && */ xr_strlen(g_sLaunchOnExit_app))
     {

diff --git a/src/xr_3da/entry_point.cpp b/src/xr_3da/entry_point.cpp
@@ -35,7 +35,11 @@ int entry_point(pcstr commandLine)
     }
     Core.Initialize("OpenXRay", nullptr, true, *fsgame ? fsgame : nullptr);
 
-    return RunApplication();
+    auto result = RunApplication();
+
+    Core._destroy();
+
+    return result;
 }
 
 int StackoverflowFilter(const int exceptionCode)