Handle scenery-override in a single place only.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 2ac958b587deacf9bd67c17df7248962c8d1a3c2..a16f77f1cd38b77a6f23602df31ef04f1493e286 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -89,11 +89,14 @@ static void fgLoadInitialScenery()
 {
     static SGPropertyNode_ptr scenery_loaded
         = fgGetNode("sim/sceneryloaded", true);
+    static SGPropertyNode_ptr scenery_override
+        = fgGetNode("/sim/sceneryloaded-override", true);
 
     if (!scenery_loaded->getBoolValue())
     {
-        if (globals->get_tile_mgr()->isSceneryLoaded()
-             && fgGetBool("sim/fdm-initialized")) {
+        if (scenery_override->getBoolValue() ||
+            (globals->get_tile_mgr()->isSceneryLoaded()
+             && fgGetBool("sim/fdm-initialized"))) {
             fgSetBool("sim/sceneryloaded",true);
             fgSplashProgress("");
         }

diff --git a/src/Time/TimeManager.cxx b/src/Time/TimeManager.cxx
index 96282bfe38b6c7f0ef8b4739802a8124a9c383a2..3a3cde1a04f277a3b653b3bb513b33713e8ef6fe 100644 (file)
--- a/src/Time/TimeManager.cxx
+++ b/src/Time/TimeManager.cxx
@@ -55,7 +55,6 @@ TimeManager::TimeManager() :
   _inited(false),
   _impl(NULL),
   _sceneryLoaded("sim/sceneryloaded"),
-  _sceneryLoadOverride("sim/sceneryloaded-override"),
   _modelHz("sim/model-hz"),
   _timeDelta("sim/time/delta-realtime-sec"),
   _simTimeDelta("sim/time/delta-sec")
@@ -163,7 +162,7 @@ void TimeManager::computeTimeDeltas(double& simDt, double& realDt)
     _lastClockFreeze = _clockFreeze->getBoolValue();
   }
 
-  bool wait_for_scenery = !(_sceneryLoaded || _sceneryLoadOverride);
+  bool wait_for_scenery = !_sceneryLoaded;
   if (!wait_for_scenery) {
     throttleUpdateRate();
   }

diff --git a/src/Time/TimeManager.hxx b/src/Time/TimeManager.hxx
index ef86c907f94fc9761fdb8bb240ea85c692845016..b710a75cee6708e692ec6d11de37736d640074f2 100644 (file)
--- a/src/Time/TimeManager.hxx
+++ b/src/Time/TimeManager.hxx
@@ -89,8 +89,7 @@ private:
   double _frameLatencyMax;
   int _frameCount;
   
-  SGPropObjBool _sceneryLoaded, 
-    _sceneryLoadOverride;
+  SGPropObjBool _sceneryLoaded;
   SGPropObjInt _modelHz;
   SGPropObjDouble _timeDelta, _simTimeDelta;
 };

diff --git a/src/Viewer/renderer.cxx b/src/Viewer/renderer.cxx
index 24f3f1d1894b0f12454c76745fee55df338b150c..fea0d42c8c7b38a6da362cf0e3aa19984e044091 100644 (file)
--- a/src/Viewer/renderer.cxx
+++ b/src/Viewer/renderer.cxx
@@ -514,7 +514,6 @@ FGRenderer::init( void )
     if (!_classicalRenderer)
         _pipeline = makeRenderingPipeline(_renderer, 0);
     _scenery_loaded   = fgGetNode("/sim/sceneryloaded", true);
-    _scenery_override = fgGetNode("/sim/sceneryloaded-override", true);
     _panel_hotspots   = fgGetNode("/sim/panel-hotspots", true);
     _virtual_cockpit  = fgGetNode("/sim/virtual-cockpit", true);
 
@@ -1531,12 +1530,11 @@ FGRenderer::setupView( void )
 
     DeletionManager::install(mRealRoot.get());
 }
-                                    
+
 // Update all Visuals (redraws anything graphics related)
 void
 FGRenderer::update( ) {
-    if (!(_scenery_loaded->getBoolValue() || 
-           _scenery_override->getBoolValue()))
+    if (!_scenery_loaded->getBoolValue())
     {
         _splash_alpha->setDoubleValue(1.0);
         return;

diff --git a/src/Viewer/renderer.hxx b/src/Viewer/renderer.hxx
index 2ff7c825224d48e95ae0d719338bbf917845aef4..a98a4b62fca7181452cb7b0306fcff02a1e8b41a 100644 (file)
--- a/src/Viewer/renderer.hxx
+++ b/src/Viewer/renderer.hxx
@@ -121,7 +121,7 @@ public:
 protected:
     osg::ref_ptr<osgViewer::Viewer> viewer;
     osg::ref_ptr<flightgear::FGEventHandler> eventHandler;
-    SGPropertyNode_ptr _scenery_loaded,_scenery_override;
+    SGPropertyNode_ptr _scenery_loaded;
     SGPropertyNode_ptr _skyblend, _splash_alpha;
     SGPropertyNode_ptr _point_sprites, _enhanced_lighting, _distance_attenuation;
     SGPropertyNode_ptr _textures;