Migrate FlightGear code to use "#include SG_GL*" defined in

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

diff --git a/src/ATC/ATC.hxx b/src/ATC/ATC.hxx
index 1bbbd846e37d89b44050d55c3f2eda16e48bebd0..cd4ab84db04ac2ffee48e571045fbb2b7dad077d 100644 (file)
--- a/src/ATC/ATC.hxx
+++ b/src/ATC/ATC.hxx
@@ -169,10 +169,10 @@ public:
        inline void set_freq(const int fq) {freq = fq;}
        inline int get_range() const { return range; }
        inline void set_range(const int rg) {range = rg;}
-       inline const char* get_ident() { return ident.c_str(); }
-       inline void set_ident(const string id) {ident = id;}
-       inline const char* get_name() {return name.c_str();}
-       inline void set_name(const string nm) {name = nm;}
+       inline string get_ident() { return ident; }
+       inline void set_ident(const string id) { ident = id; }
+       inline string get_name() { return name; }
+       inline void set_name(const string nm) { name = nm; }
        
 protected:
        
@@ -180,9 +180,9 @@ protected:
        // Outputs the transmission either on screen or as audio depending on user preference
        // The refname is a string to identify this sample to the sound manager
        // The repeating flag indicates whether the message should be repeated continuously or played once.
-       void Render(string msg, string refname, bool repeating);
+       void Render(string msg, string refname = "", bool repeating = false);
        
-       // Cease rendering a transmission.
+       // Cease rendering all transmission from this station.
        // Requires the sound manager refname if audio, else "".
        void NoRender(string refname);
        
@@ -206,10 +206,10 @@ protected:
        atc_type _type;
        
        // Rendering related stuff
-       bool voice;                     // Flag - true if we are using voice
-       bool playing;           // Indicates a message in progress      
-       bool voiceOK;           // Flag - true if at least one voice has loaded OK
-       FGATCVoice* vPtr;
+       bool _voice;                    // Flag - true if we are using voice
+       bool _playing;          // Indicates a message in progress      
+       bool _voiceOK;          // Flag - true if at least one voice has loaded OK
+       FGATCVoice* _vPtr;
 
        string pending_transmission;    // derived classes set this string before calling Transmit(...) 
        bool freqClear;         // Flag to indicate if the frequency is clear of ongoing dialog