]> git.mxchange.org Git - flightgear.git/commitdiff
Tweak scenery-loaded logic
authorJames Turner <zakalawe@mac.com>
Sat, 15 Nov 2014 16:29:30 +0000 (16:29 +0000)
committerJames Turner <zakalawe@mac.com>
Sat, 15 Nov 2014 16:29:39 +0000 (16:29 +0000)
Make first-start (not a reset / re-init) behaviour more explicit.

src/Scenery/tilemgr.cxx

index 96a10fd19e03bdec936ac4141b1067adaff64ab3..2bd513a0ac22e7b7d4898facba56d793fadd1ebb 100644 (file)
@@ -168,11 +168,15 @@ void FGTileMgr::reinit()
       _options->setModelData(new FGNasalModelDataProxy);
   
   
-    // protect against multiple scenery reloads and properly reset flags,
-    // otherwise aircraft fall through the ground while reloading scenery
-    if (!fgGetBool("/sim/sceneryloaded",true))
-        return;
-    fgSetBool("/sim/sceneryloaded",false);
+    if (state != Start)
+    {
+      // protect against multiple scenery reloads and properly reset flags,
+      // otherwise aircraft fall through the ground while reloading scenery
+      if (_scenery_loaded->getBoolValue() == false)
+          return;
+    }
+  
+    _scenery_loaded->setBoolValue(false);
     fgSetDouble("/sim/startup/splash-alpha", 1.0);
     
     materialLibChanged();