don't set the callsign, but use the set one

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

diff --git a/src/ATC/ATCmgr.hxx b/src/ATC/ATCmgr.hxx
index 992e87f3c9e95dc0992e2ec0b601a296a11fb03c..4ab2513d6e0f773deed740a49244cf27f58d7414 100644 (file)
--- a/src/ATC/ATCmgr.hxx
+++ b/src/ATC/ATCmgr.hxx
@@ -22,7 +22,8 @@
 #ifndef _FG_ATCMGR_HXX
 #define _FG_ATCMGR_HXX
 
-#include <Main/fgfs.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+
 #include <Main/fg_props.hxx>
 #include <GUI/gui.h>
 
@@ -43,10 +44,12 @@ SG_USING_STD(list);
 SG_USING_STD(map);
 
 // Structure for holding details of the ATC frequencies at a given airport, and whether they are in the active list or not.
-// These can then be cross referenced with the [atis][tower][etc]lists which are stored by frequency.
+// These can then be cross referenced with the commlists which are stored by frequency or bucket.
 // Non-available services are denoted by a frequency of zero.
-// Eventually the whole ATC data structures may have to be rethought if we turn out to be massive memory hogs!!
+// These structures are only intended to be created for in-use airports, and removed when no longer needed. 
 struct AirportATC {
+       AirportATC();
+       
     float lon;
     float lat;
     float elev;
@@ -60,17 +63,23 @@ struct AirportATC {
     //bool approach_active;
     //float departure_freq;
     //bool departure_active;
+       
+       // NOTE - the *_active flags determine whether the service is active in atc_list,
+       // *NOT* whether the tower etc is closed or not!!!!
 
     // Flags to ensure the stations don't get wrongly deactivated
     bool set_by_AI;    // true when the AI manager has activated this station
-    bool set_by_comm_search;   // true when the comm_search has activated this station
+       unsigned int numAI;     // Ref count of the number of AI planes registered
+    bool set_by_comm[2][ATC_NUM_TYPES];        // true when the relevant comm_freq has activated this station and type
 };
 
-class FGATCMgr : public FGSubsystem
+class FGATCMgr : public SGSubsystem
 {
 
 private:
 
+       bool initDone;  // Hack - guard against update getting called before init
+
     // A map of airport ID vs frequencies and ATC provision
     typedef map < string, AirportATC* > airport_atc_map_type;
     typedef airport_atc_map_type::iterator airport_atc_map_iterator;
@@ -119,10 +128,9 @@ private:
 
     double comm_range[2], comm_effective_range[2];
     bool comm_valid[2]; 
-    const char* comm_ident[2];
-    const char* last_comm_ident[2];
-
-    const char* approach_ident;
+    string comm_ident[2];
+    //string last_comm_ident[2];
+    //string approach_ident;
     bool last_in_range;
 
     //FGATIS atis;
@@ -152,13 +160,11 @@ public:
     void update(double dt);
 
     // Returns true if the airport is found in the map
-    bool GetAirportATCDetails(string icao, AirportATC* a);
+    bool GetAirportATCDetails(const string& icao, AirportATC* a);
 
     // Return a pointer to a given sort of ATC at a given airport and activate if necessary
-    FGATC* GetATCPointer(string icao, atc_type type);
-       
-       // Display a dialog box with options relevant to the currently tuned ATC service.
-       void doPopupDialog();
+       // Returns NULL if service doesn't exist - calling function should check for this.
+    FGATC* GetATCPointer(const string& icao, const atc_type& type);
        
        // Return a pointer to an appropriate voice for a given type of ATC
        // creating the voice if necessary - ie. make sure exactly one copy
@@ -167,28 +173,38 @@ public:
        // TODO - in the future this will get more complex and dole out country/airport
        // specific voices, and possible make sure that the same voice doesn't get used
        // at different airports in quick succession if a large enough selection are available.
-       FGATCVoice* GetVoicePointer(atc_type type);
+       FGATCVoice* GetVoicePointer(const atc_type& type);
        
        atc_type GetComm1ATCType() { return(comm_type[0]); }
        FGATC* GetComm1ATCPointer() { return(comm_atc_ptr[0]); }
        atc_type GetComm2ATCType() { return(comm_type[1]); }
        FGATC* GetComm2ATCPointer() { return(comm_atc_ptr[1]); }
        
+       // Get the frequency of a given service at a given airport
+       // Returns zero if not found
+       unsigned short int GetFrequency(const string& ident, const atc_type& tp);
+       
+       // Register the fact that the AI system wants to activate an airport
+       bool AIRegisterAirport(const string& ident);
+       
+       // Register the fact that the comm radio is tuned to an airport
+       bool CommRegisterAirport(const string& ident, int chan, const atc_type& tp);
+       
 private:
 
     // Remove a class from the atc_list and delete it from memory
        // *if* no other comm channel or AI plane is using it.
-    void CommRemoveFromList(const char* id, atc_type tp, int chan);
+    void CommRemoveFromList(const string& id, const atc_type& tp, int chan);
 
     // Remove a class from the atc_list and delete it from memory
        // Should be called from the above - not directly!!
-    void RemoveFromList(const char* id, atc_type tp);
+    void RemoveFromList(const string& id, const atc_type& tp);
 
     // Return a pointer to a class in the list given ICAO code and type
        // (external interface to this is through GetATCPointer) 
        // Return NULL if the given service is not in the list
        // - *** THE CALLING FUNCTION MUST CHECK FOR THIS ***
-    FGATC* FindInList(const char* id, atc_type tp);
+    FGATC* FindInList(const string& id, const atc_type& tp);
 
     // Search the specified channel for stations on the same frequency and in range.
     void FreqSearch(int channel);