version.h support in CMake builds.

[flightgear.git] / src / Main / main.cxx

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 8dbd12642509d3ff2beb8347d474934e4baae221..677d0f36bca67f2871048d0ae0289eddf98f9ee8 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -46,9 +46,11 @@
 #include <simgear/structure/event_mgr.hxx>
 #include <simgear/props/AtomicChangeListener.hxx>
 #include <simgear/props/props.hxx>
-//#include <simgear/timing/sg_time.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/magvar/magvar.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/io/raw_socket.hxx>
+#include <simgear/misc/sg_sleep.hxx>
 
 #include <Time/light.hxx>
 #include <Aircraft/replay.hxx>
@@ -65,6 +67,7 @@
 #include <Time/TimeManager.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <Environment/ephemeris.hxx>
+#include <GUI/gui.h>
 #include <GUI/new_gui.hxx>
 #include <MultiPlayer/multiplaymgr.hxx>
 
@@ -140,11 +143,8 @@ static void fgMainLoop( void ) {
                                 altitude->getDoubleValue() * SG_FEET_TO_METER,
                                 globals->get_time_params()->getJD() );
 
-#if ENABLE_ATCDCL  
     // Run ATC subsystem
-    if (fgGetBool("/sim/atc/enabled"))
-        globals->get_ATC_mgr()->update(sim_dt);
-#endif  
+    globals->get_ATC_mgr()->update(sim_dt);
     
     globals->get_subsystem_mgr()->update(sim_dt);
 
@@ -187,16 +187,24 @@ static void fgMainLoop( void ) {
     }
 #endif
 
-    // END Tile Manager udpates
+    // END Tile Manager updates
     bool scenery_loaded = fgGetBool("sim/sceneryloaded");
-    if (!scenery_loaded && globals->get_tile_mgr()->isSceneryLoaded()
-        && fgGetBool("sim/fdm-initialized")) {
-        fgSetBool("sim/sceneryloaded",true);
-        if (fgGetBool("/sim/sound/working")) {
-            globals->get_soundmgr()->activate();
+    if (!scenery_loaded)
+    {
+        if (globals->get_tile_mgr()->isSceneryLoaded()
+             && fgGetBool("sim/fdm-initialized")) {
+            fgSetBool("sim/sceneryloaded",true);
+            if (fgGetBool("/sim/sound/working")) {
+                globals->get_soundmgr()->activate();
+            }
+            globals->get_props()->tie("/sim/sound/devices/name",
+                  SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
+        }
+        else
+        {
+            // be nice to loader threads while waiting for initial scenery, reduce to 2fps
+            simgear::sleepForMSec(500);
         }
-        globals->get_props()->tie("/sim/sound/devices/name",
-              SGRawValueFunctions<const char *>(0, fgSetNewSoundDevice), false);
     }
     simgear::AtomicChangeListener::fireChangeListeners();