Bug fix from Norman Vine.

diff --git a/src/GUI/apt_dlg.cxx b/src/GUI/apt_dlg.cxx
index a6a5220f4c847a95a88890ad0883e463bf4ade29..49e3336d2fc1dd10adb9f6a01528ecca5bcfd08a 100644 (file)
--- a/src/GUI/apt_dlg.cxx
+++ b/src/GUI/apt_dlg.cxx
@@ -24,7 +24,7 @@
 #include <Main/fg_init.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
-//#include <Time/fg_time.hxx>
+#include <Scenery/tilemgr.hxx>
 
 #include "gui.h"
 #include "gui_local.hxx"
@@ -46,103 +46,116 @@ static puOneShot       *AptDialogResetButton = 0;
 
 void AptDialog_Cancel(puObject *)
 {
-       FG_POP_PUI_DIALOG( AptDialog );
+    FG_POP_PUI_DIALOG( AptDialog );
 }
 
 void AptDialog_OK (puObject *)
 {
-       SGPath path( globals->get_fg_root() );
-       path.append( "Airports" );
-       path.append( "simple.mk4" );
-       FGAirports airports( path.c_str() );
-
-       FGAirport a;
-
-       int freeze = globals->get_freeze();
-       if(!freeze)
-               globals->set_freeze( true );
-
-       char *s;
-       AptDialogInput->getValue(&s);
-       string AptId(s);
-
-       cout << "AptDialog_OK " << AptId << " " << AptId.length() << endl;
-
-       AptDialog_Cancel( NULL );
-
-       if ( AptId.length() ) {
-               // set initial position from airport id
-               SG_LOG( SG_GENERAL, SG_INFO,
-                               "Attempting to set starting position from airport code "
-                               << AptId );
-
-               if ( airports.search( AptId, &a ) )
-               {
-                       fgSetString("/sim/startup/airport-id",  AptId.c_str() );
-                       // fgSetDouble("/position/altitude", -9999.0 );
-                       // fgSetPosFromAirportID( AptId );
-                       fgSetPosFromAirportIDandHdg( AptId, 
-                                                    cur_fdm_state->get_Psi() *
-                                                    SGD_RADIANS_TO_DEGREES);
-                       BusyCursor(0);
-                       fgReInitSubsystems();
-                       BusyCursor(1);
-               } else {
-                       AptId  += " not in database.";
-                       mkDialog(AptId.c_str());
-               }
-       }
-       if(!freeze)
-               globals->set_freeze( false );
+    SGPath path( globals->get_fg_root() );
+    path.append( "Airports" );
+    path.append( "simple.mk4" );
+    FGAirports airports( path.c_str() );
+
+    FGAirport a;
+
+    int freeze = globals->get_freeze();
+    if(!freeze)
+        globals->set_freeze( true );
+
+    char *s;
+    AptDialogInput->getValue(&s);
+    string AptId(s);
+
+    cout << "AptDialog_OK " << AptId << " " << AptId.length() << endl;
+
+    AptDialog_Cancel( NULL );
+
+    if ( AptId.length() ) {
+        // set initial position from airport id
+        SG_LOG( SG_GENERAL, SG_INFO,
+                "Attempting to set starting position from airport code "
+                << AptId );
+
+        if ( airports.search( AptId, &a ) )
+            {
+                fgSetString("/sim/startup/airport-id",  AptId.c_str() );
+                // fgSetDouble("/position/altitude", -9999.0 );
+                // fgSetPosFromAirportID( AptId );
+                fgSetPosFromAirportIDandHdg( AptId, 
+                                             cur_fdm_state->get_Psi() *
+                                             SGD_RADIANS_TO_DEGREES);
+                BusyCursor(0);
+                fgReInitSubsystems();
+                if ( global_tile_mgr.init() ) {
+                    // Load the local scenery data
+                    global_tile_mgr.update( 
+                                           cur_fdm_state->get_Longitude()
+                                           * SGD_RADIANS_TO_DEGREES,
+                                           cur_fdm_state->get_Latitude()
+                                           * SGD_RADIANS_TO_DEGREES );
+                } else {
+                    SG_LOG( SG_GENERAL, SG_ALERT, 
+                            "Error in Tile Manager initialization!" );
+                    exit(-1);
+                }
+                BusyCursor(1);
+            } else {
+                AptId  += " not in database.";
+                mkDialog(AptId.c_str());
+            }
+    }
+    if(!freeze)
+        globals->set_freeze( false );
 }
 
+
 void AptDialog_Reset(puObject *)
 {
-       //  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
-       sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
-       AptDialogInput->setValue ( NewAirportId );
-       AptDialogInput->setCursor( 0 ) ;
+    //  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
+    sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+    AptDialogInput->setValue ( NewAirportId );
+    AptDialogInput->setCursor( 0 ) ;
 }
 
 void NewAirport(puObject *cb)
 {
-       //  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
-       sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
-//     cout << "NewAirport " << NewAirportId << endl;
-       AptDialogInput->setValue( NewAirportId );
+    //  strncpy( NewAirportId, fgGetString("/sim/startup/airport-id").c_str(), 16 );
+    sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+    // cout << "NewAirport " << NewAirportId << endl;
+    AptDialogInput->setValue( NewAirportId );
 
-       FG_PUSH_PUI_DIALOG( AptDialog );
+    FG_PUSH_PUI_DIALOG( AptDialog );
 }
 
 void NewAirportInit(void)
 {
-       sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
-       int len = 150 - puGetStringWidth( puGetDefaultLabelFont(),
-                                                                         NewAirportLabel ) / 2;
-
-       AptDialog = new puDialogBox (150, 50);
-       {
-               AptDialogFrame   = new puFrame           (0,0,350, 150);
-               AptDialogMessage = new puText            (len, 110);
-               AptDialogMessage ->    setLabel          (NewAirportLabel);
-
-               AptDialogInput   = new puInput           (50, 70, 300, 100);
-               AptDialogInput   ->    setValue          (NewAirportId);
-               AptDialogInput   ->    acceptInput();
-
-               AptDialogOkButton     =  new puOneShot   (50, 10, 110, 50);
-               AptDialogOkButton     ->     setLegend   (gui_msg_OK);
-               AptDialogOkButton     ->     setCallback (AptDialog_OK);
-               AptDialogOkButton     ->     makeReturnDefault(TRUE);
-
-               AptDialogCancelButton =  new puOneShot   (140, 10, 210, 50);
-               AptDialogCancelButton ->     setLegend   (gui_msg_CANCEL);
-               AptDialogCancelButton ->     setCallback (AptDialog_Cancel);
-
-               AptDialogResetButton  =  new puOneShot   (240, 10, 300, 50);
-               AptDialogResetButton  ->     setLegend   (gui_msg_RESET);
-               AptDialogResetButton  ->     setCallback (AptDialog_Reset);
-       }
-       cout << "NewAirportInit " << NewAirportId << endl;
-       FG_FINALIZE_PUI_DIALOG( AptDialog );
+    sprintf( NewAirportId, "%s", fgGetString("/sim/startup/airport-id").c_str() );
+    int len = 150 - puGetStringWidth( puGetDefaultLabelFont(),
+                                      NewAirportLabel ) / 2;
+
+    AptDialog = new puDialogBox (150, 50);
+    {
+        AptDialogFrame   = new puFrame           (0,0,350, 150);
+        AptDialogMessage = new puText            (len, 110);
+        AptDialogMessage ->    setLabel          (NewAirportLabel);
+
+        AptDialogInput   = new puInput           (50, 70, 300, 100);
+        AptDialogInput   ->    setValue          (NewAirportId);
+        AptDialogInput   ->    acceptInput();
+
+        AptDialogOkButton     =  new puOneShot   (50, 10, 110, 50);
+        AptDialogOkButton     ->     setLegend   (gui_msg_OK);
+        AptDialogOkButton     ->     setCallback (AptDialog_OK);
+        AptDialogOkButton     ->     makeReturnDefault(TRUE);
+
+        AptDialogCancelButton =  new puOneShot   (140, 10, 210, 50);
+        AptDialogCancelButton ->     setLegend   (gui_msg_CANCEL);
+        AptDialogCancelButton ->     setCallback (AptDialog_Cancel);
+
+        AptDialogResetButton  =  new puOneShot   (240, 10, 300, 50);
+        AptDialogResetButton  ->     setLegend   (gui_msg_RESET);
+        AptDialogResetButton  ->     setCallback (AptDialog_Reset);
+    }
+    cout << "NewAirportInit " << NewAirportId << endl;
+    FG_FINALIZE_PUI_DIALOG( AptDialog );
 }