Test2

Main.cpp

@@ -10,7 +10,9 @@
     \/_____/ \/_____/ \/_/  \/_/ \/_/  \/_/ \/_____/ \/_/ \/_/ \/_/   \/_/  \/_____/     \/_/    \/_/ /_/ \/_____/\/_____/ \/_____/ \/_____/   \/_/
 
 /////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\/////\\\\\*/
-
+a
+b
+c
 /// <summary>
 /// Main driver implementation of the Retro Terrain Engine.
 /// Data Realms, LLC - http://www.datarealms.com

Managers/SceneMan.cpp

@@ -441,8 +441,8 @@ void SceneMan::Destroy()
 
 Vector SceneMan::GetSceneDim() const
 {
-    RTEAssert(m_pCurrentScene && m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");
     if (m_pCurrentScene)
+        RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");
         return m_pCurrentScene->GetDimensions();
     return Vector();
 }
@@ -3432,7 +3432,9 @@ bool SceneMan::AddSceneObject(SceneObject *pObject)
 
 void SceneMan::Update(int screen)
 {
-	RTEAssert(m_pCurrentScene, "Trying to access scene before there is one!");
+    if (m_pCurrentScene == nullptr) {
+        return;
+    }
 
     // Record screen was the last updated screen
     m_LastUpdatedScreen = screen;
@@ -3572,7 +3574,9 @@ void SceneMan::Update(int screen)
 
 void SceneMan::Draw(BITMAP *pTargetBitmap, BITMAP *pTargetGUIBitmap, const Vector &targetPos, bool skipSkybox, bool skipTerrain)
 {
-    RTEAssert(m_pCurrentScene, "Trying to access scene before there is one!");
+    if (m_pCurrentScene == nullptr) {
+        return;
+    }
     // Handy
     SLTerrain *pTerrain = m_pCurrentScene->GetTerrain();
 
@@ -3689,4 +3693,10 @@ void SceneMan::ClearSeenPixels()
         m_pCurrentScene->ClearSeenPixels(team);
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void SceneMan::ClearCurrentScene() {
+    m_pCurrentScene = nullptr;
+}
+
 } // namespace RTE

Managers/SceneMan.h

@@ -1714,6 +1714,10 @@ class SceneMan:
 		bool back;
 	};
 
+    /// <summary>
+    /// Sets the current scene pointer to null
+    /// </summary>
+    void SceneMan::ClearCurrentScene();
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Protected member variable and method declarations
@@ -1821,7 +1825,7 @@ class SceneMan:
 
     void Clear();
 
-
+    
     // Disallow the use of some implicit methods.
     SceneMan(const SceneMan &reference);
     SceneMan & operator=(const SceneMan &rhs);

Menus/MetagameGUI.cpp

@@ -3016,6 +3016,8 @@ void MetagameGUI::CompletedActivity()
             // Deep copy over all the edits made to the newly played Scene
             m_pPlayingScene->Destroy();
             m_pPlayingScene->Create(*pAlteredScene);
+            // Null the current scene, which is pointed to by pAlteredScene.
+            g_SceneMan.ClearCurrentScene();
             // Scrub the module ID so the migration goes well.. this is a bit hacky, but ok in this special case
             m_pPlayingScene->SetModuleID(-1);
             m_pPlayingScene->GetTerrain()->SetModuleID(-1);