g_appLoaded removed in favor of pApp->IsLoaded().

OpenXRay · Nov 24, 2015 · b6e34b1 · b6e34b1
1 parent 66c7d5a
commit b6e34b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -866,7 +866,6 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 extern CRenderDevice Device;
 
 static CTimer phase_timer;
-ENGINE_API BOOL g_appLoaded = FALSE;
 
 void doBenchmark(LPCSTR name)
 {

diff --git a/src/xrEngine/x_ray.cpp b/src/xrEngine/x_ray.cpp
@@ -20,7 +20,6 @@
 
 //---------------------------------------------------------------------
 
-extern ENGINE_API BOOL g_appLoaded;
 extern CRenderDevice Device;
 
 #ifdef MASTER_GOLD
@@ -92,6 +91,7 @@ void _InitializeFont(CGameFont*& F, LPCSTR section, u32 flags)
 
 CApplication::CApplication()
 {
+    loaded = false;
     ll_dwReference = 0;
 
     max_load_stage = 0;
@@ -247,8 +247,7 @@ void CApplication::LoadBegin()
     ll_dwReference++;
     if (1 == ll_dwReference)
     {
-
-        g_appLoaded = FALSE;
+        loaded = false;
 
 #ifndef DEDICATED_SERVER
         _InitializeFont(pFontSystem, "ui_font_letterica18_russian", 0);
@@ -270,7 +269,7 @@ void CApplication::LoadEnd()
         Msg("* phase time: %d ms", phase_timer.GetElapsed_ms());
         Msg("* phase cmem: %d K", Memory.mem_usage() / 1024);
         Console->Execute("stat_memory");
-        g_appLoaded = TRUE;
+        loaded = true;
         // DUMP_PHASE;
     }
 }
@@ -285,7 +284,9 @@ void CApplication::destroy_loading_shaders()
 
 void CApplication::LoadDraw()
 {
-    if (g_appLoaded) return;
+    if (loaded)
+        return;
+
     Device.dwFrame += 1;
 
 

diff --git a/src/xrEngine/x_ray.h b/src/xrEngine/x_ray.h
@@ -32,6 +32,7 @@ class ENGINE_API CApplication :
     int load_stage;
 
     u32 ll_dwReference;
+    bool loaded;
 private:
     EVENT eQuit;
     EVENT eStart;
@@ -44,6 +45,8 @@ class ENGINE_API CApplication :
 public:
     CGameFont* pFontSystem;
 
+    bool IsLoaded() { return loaded; }
+
     // Levels
     xr_vector<sLevelInfo> Levels;
     u32 Level_Current;

diff --git a/src/xrGame/script_render_device_script.cpp b/src/xrGame/script_render_device_script.cpp
@@ -8,6 +8,7 @@
 
 #include "pch_script.h"
 #include "xrScriptEngine/ScriptExporter.hpp"
+#include "xrEngine/x_ray.h"
 
 using namespace luabind;
 
@@ -21,10 +22,9 @@ void set_device_paused(CRenderDevice* d, bool b)
 	Device.Pause(b, TRUE, FALSE,"set_device_paused_script");
 }
 
-extern ENGINE_API BOOL g_appLoaded;
 bool is_app_ready()
 {
-	return !!g_appLoaded;
+    return pApp->IsLoaded();
 }
 
 u32 time_global(const CRenderDevice *self)