From 06170ddaae3c3d79834faca1303a5fab38808659 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Mon, 17 Sep 2012 13:37:36 +0200
Subject: [PATCH] Handle scenery-override in a single place only.

---
 src/Main/main.cxx        | 7 +++++--
 src/Time/TimeManager.cxx | 3 +--
 src/Time/TimeManager.hxx | 3 +--
 src/Viewer/renderer.cxx  | 6 ++----
 src/Viewer/renderer.hxx  | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 2ac958b58..a16f77f1c 100644
--- 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 96282bfe3..3a3cde1a0 100644
--- 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 ef86c907f..b710a75ce 100644
--- 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 24f3f1d18..fea0d42c8 100644
--- 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 2ff7c8252..a98a4b62f 100644
--- 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;