new FSF address

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

diff --git a/src/ATC/ground.hxx b/src/ATC/ground.hxx
index 1a8a94cd2b184fd1eb1a6df6e47311efd51d0e51..318191c82668f66c80699710a1cf45f9a409ed04 100644 (file)
--- a/src/ATC/ground.hxx
+++ b/src/ATC/ground.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef _FG_GROUND_HXX
 #define _FG_GROUND_HXX
@@ -225,21 +225,19 @@ class FGGround : public FGATC {
 
 public:
        FGGround();
-       FGGround(string id);
+       FGGround(const string& id);
        ~FGGround();
     void Init();
 
     void Update(double dt);
        
-       inline string get_trans_ident() { return trans_ident; }
-    inline void SetDisplay() {display = true;}
-    inline void SetNoDisplay() {display = false;}
+       inline const string& get_trans_ident() { return trans_ident; }
 
     // Contact ground control on arrival, assumed to request any gate
     //void NewArrival(plane_rec plane);
 
     // Contact ground control on departure, assumed to request currently active runway.
-    void RequestDeparture(PlaneRec plane, FGAIEntity* requestee);
+    void RequestDeparture(const PlaneRec& plane, FGAIEntity* requestee);
 
     // Contact ground control when the calling routine doesn't know if arrival
     // or departure is appropriate.
@@ -258,22 +256,22 @@ public:
        Gate* GetGateNode();
        
        // Return a pointer to a hold short node
-       node* GetHoldShortNode(string rwyID);
+       node* GetHoldShortNode(const string& rwyID);
        
        // Runway stuff - this might change in the future.
        // Get a list of exits from a given runway
        // It is up to the calling function to check for non-zero size of returned array before use
-       node_array_type GetExits(string rwyID);
+       node_array_type GetExits(const string& rwyID);
        
        // Get a path from one node to another
        ground_network_path_type GetPath(node* A, node* B);
        
        // Get a path from a node to a runway threshold
-       ground_network_path_type GetPath(node* A, string rwyID);
+       ground_network_path_type GetPath(node* A, const string& rwyID);
        
        // Get a path from a node to a runway hold short point
        // Bit of a hack this at the moment!
-       ground_network_path_type GetPathToHoldShort(node* A, string rwyID);
+       ground_network_path_type GetPathToHoldShort(node* A, const string& rwyID);
 
 private:
        FGATCMgr* ATCmgr;       
@@ -313,8 +311,6 @@ private:
        SGPropertyNode* wind_from_hdg;  //degrees
        SGPropertyNode* wind_speed_knots;               //knots
        
-       bool display;           // Flag to indicate whether we should be outputting to the ATC display.
-       bool displaying;                // Flag to indicate whether we are outputting to the ATC display.
        // for failure modeling
        string trans_ident;             // transmitted ident
        bool ground_failed;             // ground failed?
@@ -326,7 +322,7 @@ private:
 
        // Logical runway details - this might change in the future.
        //runway_array_type runways;    // STL way
-       Rwy runways[36];        // quick hack!
+       Rwy runways[37];        // quick hack!
        
        // Physical runway details
        double aptElev;         // Airport elevation
@@ -355,7 +351,7 @@ private:
        
        // Return a pointer to the node at a runway threshold
        // Returns NULL if unsuccessful.
-       node* GetThresholdNode(string rwyID);
+       node* GetThresholdNode(const string& rwyID);
        
        // A shortest path algorithm from memory (I can't find the bl&*dy book again!)
        ground_network_path_type GetShortestPath(node* A, node* B);