add asserts

OpenXRay · Nov 6, 2018 · b49e03a · b49e03a
1 parent 2a21afc
commit b49e03a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/src/Layers/xrRenderPC_GL/rgl.cpp b/src/Layers/xrRenderPC_GL/rgl.cpp
@@ -452,6 +452,7 @@ void CRender::OnFrame()
     if (ps_r2_ls_flags.test(R2FLAG_EXP_MT_CALC))
     {
         // MT-details (@front)
+        assert (Details);
         Device.seqParallel.insert(Device.seqParallel.begin(),
                                   fastdelegate::FastDelegate0<>(Details, &CDetailManager::MT_CALC));
 

diff --git a/src/xrCore/fastdelegate.h b/src/xrCore/fastdelegate.h
@@ -52,6 +52,7 @@
 #endif // _MSC_VER > 1000
 
 #include <memory.h> // to allow <,> comparisons
+#include <cassert>
 
 //////////////////////////////////////////////////
 #define xr_stdcall __stdcall
@@ -969,7 +970,11 @@ class FastDelegate0
         m_Closure.bindstaticfunc(this, &FastDelegate0::InvokeStaticFunction, function_to_bind);
     }
     // Invoke the delegate
-    RetType operator()() const { return (m_Closure.GetClosureThis()->*(m_Closure.GetClosureMemPtr()))(); }
+    RetType operator()() const {
+        assert (m_Closure.GetClosureThis());
+        assert (m_Closure.GetClosureMemPtr());
+        return (m_Closure.GetClosureThis()->*(m_Closure.GetClosureMemPtr()))();
+    }
     // Implicit conversion to "bool" using the safe_bool idiom
 private:
     typedef struct SafeBoolStruct

diff --git a/src/xrGame/Level.cpp b/src/xrGame/Level.cpp
@@ -440,7 +440,10 @@ void CLevel::OnFrame()
     if (!GEnv.isDedicatedServer)
     {
         if (g_mt_config.test(mtMap))
+        {
+            assert(m_map_manager);
             Device.seqParallel.push_back(fastdelegate::FastDelegate0<>(m_map_manager, &CMapManager::Update));
+        }
         else
             MapManager().Update();
         if (IsGameTypeSingle() && Device.dwPrecacheFrame == 0)
@@ -549,6 +552,7 @@ void CLevel::OnFrame()
     {
         if (g_mt_config.test(mtLevelSounds))
         {
+            assert(m_level_sound_manager);
             Device.seqParallel.push_back(
                 fastdelegate::FastDelegate0<>(m_level_sound_manager, &CLevelSoundManager::Update));
         }

diff --git a/src/xrGame/ui/UIPdaWnd.cpp b/src/xrGame/ui/UIPdaWnd.cpp
@@ -165,6 +165,7 @@ void CUIPdaWnd::Update()
     m_clock->TextItemControl().SetText(
         InventoryUtilities::GetGameTimeAsString(InventoryUtilities::etpTimeToMinutes).c_str());
 
+    assert(pUILogsWnd);
     Device.seqParallel.push_back(fastdelegate::FastDelegate0<>(pUILogsWnd, &CUILogsWnd::PerformWork));
 }