Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / ATC / atc_mgr.hxx

diff --git a/src/ATC/atc_mgr.hxx b/src/ATC/atc_mgr.hxx
index 81025b95edac36ca9121b69a996ebabb45404257..0d9efa730b81bcffe139dae4a540441c783e34b9 100644 (file)
--- a/src/ATC/atc_mgr.hxx
+++ b/src/ATC/atc_mgr.hxx
@@ -49,9 +49,9 @@ class FGATCManager : public SGSubsystem
 private:
   AtcVec activeStations;
   FGAIAircraft ai_ac;
-  FGATCController *controller; // The ATC controller that is responsible for the user's aircraft. 
-  //FGATCDialogNew dialog;  // note that this variable should really replace the ugly global "currentATCDialog();
+  FGATCController *controller, *prevController; // The ATC controller that is responsible for the user's aircraft. 
   bool networkVisible;
+  bool initSucceeded;
 
 public:
   FGATCManager();
@@ -59,7 +59,6 @@ public:
   void init();
   void addController(FGATCController *controller);
   void update(double time);
-  FGATCDialogNew * getATCDialog() {  return currentATCDialog; };
 };
   
 #endif // _ATC_MRG_HXX_
\ No newline at end of file