Move the texture loader to SimGear

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

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 9c77d4569606b874e99188c43e870b58880f49dd..e2e23766e1cc09eca5ded03b21e99b8325422a11 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -739,7 +739,7 @@ static bool fgSetPosFromAirportIDandRwy( const string& id, const string& rwy ) {
 
         SG_LOG( SG_GENERAL, SG_INFO,
                 "Attempting to set starting position for "
-                << id << ":" << runway );
+                << id << ":" << rwy );
 
         if ( ! runways.search( id, rwy, &r ) ) {
             SG_LOG( SG_GENERAL, SG_ALERT,
@@ -1523,11 +1523,10 @@ bool fgInitSubsystems() {
     // Initialise the AI Manager 
     ////////////////////////////////////////////////////////////////////
 
-    if (fgGetBool("/sim/ai-traffic/enabled")) {
-        SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
-        globals->set_AI_mgr(new FGAIMgr);
-        globals->get_AI_mgr()->init();
-    }
+    SG_LOG(SG_GENERAL, SG_INFO, "  AI Manager");
+    globals->set_AI_mgr(new FGAIMgr);
+    globals->get_AI_mgr()->init();
+
 
 #ifdef ENABLE_AUDIO_SUPPORT
     ////////////////////////////////////////////////////////////////////
@@ -1593,17 +1592,22 @@ bool fgInitSubsystems() {
     globals->get_io()->init();
     globals->get_io()->bind();
 
-    // Initialize the 2D panel.
+
+    ////////////////////////////////////////////////////////////////////
+    // Add a new 2D panel.
+    ////////////////////////////////////////////////////////////////////
+
     string panel_path = fgGetString("/sim/panel/path",
                                     "Panels/Default/default.xml");
-    current_panel = fgReadPanel(panel_path);
-    if (current_panel == 0) {
+
+    globals->set_current_panel( fgReadPanel(panel_path) );
+    if (globals->get_current_panel() == 0) {
         SG_LOG( SG_INPUT, SG_ALERT, 
                 "Error reading new panel from " << panel_path );
     } else {
         SG_LOG( SG_INPUT, SG_INFO, "Loaded new panel from " << panel_path );
-        current_panel->init();
-        current_panel->bind();
+        globals->get_current_panel()->init();
+        globals->get_current_panel()->bind();
     }