Norman's changes to display a scrolling "PAUSE" message when the simulation

is paused.

diff --git a/src/Autopilot/newauto.cxx b/src/Autopilot/newauto.cxx
index 845e3be4f3ed629261b06ba50d79e042685811c3..a54eaf8fe67ea72395271e73d06fee02a0ea90f6 100644 (file)
--- a/src/Autopilot/newauto.cxx
+++ b/src/Autopilot/newauto.cxx
@@ -358,6 +358,9 @@ int FGAutopilot::run() {
     double lon = longitude_node->getDoubleValue();
     double alt = altitude_node->getDoubleValue() * SG_FEET_TO_METER;
 
+    SG_LOG( SG_ALL, SG_DEBUG, "FGAutopilot::run()  lat = " << lat <<
+            "  lon = " << lon << "  alt = " << alt );
+       
 #ifdef FG_FORCE_AUTO_DISENGAGE
     // see if somebody else has changed them
     if( fabs(aileron - old_aileron) > disengage_threshold ||
@@ -779,7 +782,9 @@ int FGAutopilot::run() {
     old_lat = lat;
     old_lon = lon;
        
-       // Ok, we are done
+    // Ok, we are done
+    SG_LOG( SG_ALL, SG_DEBUG, "FGAutopilot::run( returns )" );
+
     return 0;
 }
 

diff --git a/src/GUI/apt_dlg.cxx b/src/GUI/apt_dlg.cxx
index 6a5581dd8f22d86f7dd87196e91253ed631bd635..d7c0b6334088acca8b96c5ab04f6fb4831ad5468 100644 (file)
--- a/src/GUI/apt_dlg.cxx
+++ b/src/GUI/apt_dlg.cxx
@@ -95,7 +95,7 @@ void AptDialog_OK (puObject *)
             fgSetPosFromAirportIDandHdg( AptId, 
                                          cur_fdm_state->get_Psi() *
                                          SGD_RADIANS_TO_DEGREES);
-            BusyCursor(0);
+            // BusyCursor(0);
             fgReInitSubsystems();
             // if ( global_tile_mgr.init() ) {
             // Load the local scenery data
@@ -106,7 +106,7 @@ void AptDialog_OK (puObject *)
             // "Error in Tile Manager initialization!" );
             // exit(-1);
             // }
-            BusyCursor(1);
+            // BusyCursor(1);
         } else {
             AptId  += " not in database.";
             mkDialog(AptId.c_str());

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index bf4afa4b2f9e7e97c0776c455db503f795f1b621..7440c732f7d4312ad7628188f01c60ddc976d9ca 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -723,7 +723,7 @@ void printScreen ( puObject *obj ) {
        show_pu_cursor = true;
        puHideCursor();
     }
-    BusyCursor( 0 );
+    // BusyCursor( 0 );
     mainMenuBar->hide();
 
     CGlPrinter p( CGlPrinter::PRINT_BITMAP );
@@ -735,7 +735,7 @@ void printScreen ( puObject *obj ) {
     if( gui_menu_on ) {
        mainMenuBar->reveal();
     }
-    BusyCursor(1);
+    // BusyCursor(1);
     if ( show_pu_cursor ) {
        puShowCursor();
     }

diff --git a/src/GUI/gui_local.cxx b/src/GUI/gui_local.cxx
index 1506577c54abaacce5b3b85934e75f1d23b6a00a..37b3d3b4c904ee493b983efd10af51d53db9c064 100644 (file)
--- a/src/GUI/gui_local.cxx
+++ b/src/GUI/gui_local.cxx
@@ -51,7 +51,7 @@ void initMouseQuat(void) {
 
 void reInit(puObject *cb)
 {
-    BusyCursor(0);
+    // BusyCursor(0);
     Quat0();
 
     int freeze = globals->get_freeze();
@@ -86,7 +86,7 @@ void reInit(puObject *cb)
 
     fgReshape( xsize, ysize );
 
-    BusyCursor(1);
+    // BusyCursor(1);
     
     if ( !freeze ) {
         globals->set_freeze( false );

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index b6bf7f043d659c13eb98e065d0504dbdb08c6ae9..77b9aedf76b49f01f8d9381ef071aaf98c82a8c0 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -271,7 +271,7 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
   SG_LOG(SG_INPUT, SG_INFO, "ReIniting TileCache");
   if ( !freeze ) 
     globals->set_freeze( true );
-  BusyCursor(0);
+  // BusyCursor(0);
   if ( global_tile_mgr.init() ) {
     // Load the local scenery data
     global_tile_mgr.update(fgGetDouble("/position/longitude-deg"),
@@ -281,7 +281,7 @@ do_tile_cache_reload (const SGPropertyNode * arg, SGCommandState ** state)
            "Error in Tile Manager initialization!" );
     exit(-1);
   }
-  BusyCursor(1);
+  // BusyCursor(1);
   if ( !freeze )
     globals->set_freeze( false );
   return true;

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 1710a01a367b697679ff2b3d30a93c036a4e6d3e..a51b9750f16aea0163f3da23ad1c4ebbe363139e 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -28,6 +28,7 @@
 
 #include STL_IOSTREAM
 
+#include <ATC/ATCdisplay.hxx>
 #include <Autopilot/newauto.hxx>
 #include <Aircraft/aircraft.hxx>
 #include <Time/tmp.hxx>
@@ -278,7 +279,15 @@ getFreeze ()
 static void
 setFreeze (bool freeze)
 {
-  globals->set_freeze(freeze);
+    globals->set_freeze(freeze);
+    if ( freeze ) {
+        // BusyCursor( 0 );
+        current_atcdisplay->CancelRepeatingMessage();
+        current_atcdisplay->RegisterRepeatingMessage("****    SIM IS PAUSED    ****    SIM IS PAUSED    ****");
+    } else {
+        // BusyCursor( 1 );
+        current_atcdisplay->CancelRepeatingMessage();
+    }
 }
 
 /**