Delay deletion of AI traffic until after it has had time to release the frequency...

[flightgear.git] / src / GUI / gui_funcs.cxx

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index a9f4277a2d01b47edf9ebb9d84c99ee280b6ffbd..a4a30ee62e8ecb8619907c07976b4a347c98eec4 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -69,20 +69,16 @@
 #include <Aircraft/aircraft.hxx>
 #include <Airports/simple.hxx>
 #include <Autopilot/auto_gui.hxx>
-#include <Autopilot/newauto.hxx>
 #include <Cockpit/panel.hxx>
 #include <Controls/controls.hxx>
 #include <FDM/flight.hxx>
+#include <Main/main.hxx>
 #include <Main/fg_init.hxx>
 #include <Main/fg_io.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
 
-#ifdef FG_NETWORK_OLK
-#include <NetworkOLK/network.h>
-#endif
-   
 #if defined( WIN32 ) && !defined( __CYGWIN__ ) && !defined(__MINGW32__)
 #  include <simgear/screen/win32-printer.h>
 #  include <simgear/screen/GlBitmaps.h>
@@ -90,7 +86,6 @@
 
 #include "gui.h"
 #include "gui_local.hxx"
-#include "net_dlg.hxx"
 #include "preset_dlg.hxx"
 #include "prop_picker.hxx"
 #include "sgVec3Slider.hxx"
@@ -98,19 +93,11 @@
 SG_USING_STD(string);
 SG_USING_STD(cout);
 
-// main.cxx hack, should come from an include someplace
-extern void fgInitVisuals( void );
-extern void fgRenderFrame( void );
-
 extern void fgHUDalphaAdjust( puObject * );
 
 // from cockpit.cxx
 extern void fgLatLonFormatToggle( puObject *);
 
-#ifdef FG_NETWORK_OLK
-extern void net_fgd_scan(puObject *cb);
-#endif // #ifdef FG_NETWORK_OLK
-
 #if defined( TR_HIRES_SNAP)
 #include <simgear/screen/tr.h>
 extern void trRenderFrame( void );
@@ -173,22 +160,12 @@ const __fg_gui_fn_t __fg_gui_fn[] = {
         {"fgPresetAirspeed", fgPresetAirspeed},
         {"fgPresetCommit", fgPresetCommit},
 
-        // Network
-#ifdef FG_NETWORK_OLK
-        {"net_display_toggle", net_display_toggle},
-        {"NewCallSign", NewCallSign},
-        {"net_fgd_scan", net_fgd_scan},
-        {"net_register", net_register},
-        {"net_unregister", net_unregister},
-#endif
-
         // Autopilot
         {"NewAltitude", NewAltitude},
        {"NewHeading", NewHeading},
         {"AddWayPoint", AddWayPoint},
         {"PopWayPoint", PopWayPoint},
         {"ClearRoute", ClearRoute},
-        {"fgAPAdjust", fgAPAdjust},
         {"fgLatLonFormatToggle", fgLatLonFormatToggle},
 
         // Help
@@ -407,12 +384,6 @@ void goodBye(puObject *)
     //      "Program exiting normally at user request." );
     cout << "Program exiting normally at user request." << endl;
 
-#ifdef FG_NETWORK_OLK    
-    if ( fgGetBool("/sim/networking/network-olk") ) {
-       if ( net_is_registered == 0 ) fgd_send_com( "8", FGFS_host);
-    }
-#endif
-
     // close all external I/O connections
     globals->get_io()->shutdown_all();
 
@@ -864,25 +835,3 @@ void fgDumpSnapShot () {
     }
 }
 
-#ifdef FG_NETWORK_OLK
-void net_display_toggle( puObject *cb)
-{
-       net_hud_display = (net_hud_display) ? 0 : 1;
-       printf("Toggle net_hud_display : %d\n", net_hud_display);
-}
-
-void net_register( puObject *cb)
-{
-       fgd_send_com( "1", FGFS_host );
-       net_is_registered = 0;
-       printf("Registering to deamon\n");
-}
-
-void net_unregister( puObject *cb)
-{
-       fgd_send_com( "8", FGFS_host );
-       net_is_registered = -1;
-       printf("Unregistering from deamon\n");
-}
-
-#endif // #ifdef FG_NETWORK_OLK