Fix two bugs in the new autopilot code

[flightgear.git] / src / ATCDCL / tower.hxx

diff --git a/src/ATCDCL/tower.hxx b/src/ATCDCL/tower.hxx
index ad1c2ba17d4d4893602f17e88795024e4f64d9a2..a09536993f1df57c16ef2b6e6a50ef79da89ed56 100644 (file)
--- a/src/ATCDCL/tower.hxx
+++ b/src/ATCDCL/tower.hxx
@@ -22,12 +22,12 @@
 #define _FG_TOWER_HXX
 
 #include <simgear/compiler.h>
-#include <simgear/math/point3d.hxx>
+#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sgstream.hxx>
-#include <plib/sg.h>
 
 #include <iosfwd>
-#include STL_STRING
+#include <string>
+#include <list>
 
 #include "ATC.hxx"
 #include "ATCProjection.hxx"
@@ -71,13 +71,13 @@ public:
        
        TowerPlaneRec();
        TowerPlaneRec(const PlaneRec& p);
-       TowerPlaneRec(const Point3D& pt);
-       TowerPlaneRec(const PlaneRec& p, const Point3D& pt);
+       TowerPlaneRec(const SGGeod& pt);
+       TowerPlaneRec(const PlaneRec& p, const SGGeod& pt);
        
        FGAIPlane* planePtr;    // This might move to the planeRec eventually
        PlaneRec plane;
        
-       Point3D pos;
+       SGGeod pos;
        double eta;             // seconds
        double dist_out;        // meters from theshold
        bool clearedToLand;
@@ -214,10 +214,10 @@ private:
        
        // Figure out if a given position lies on the active runway
        // Might have to change when we consider more than one active rwy.
-       bool OnActiveRunway(const Point3D& pt);
+       bool OnActiveRunway(const SGGeod& pt);
        
        // Figure out if a given position lies on a runway or not
-       bool OnAnyRunway(const Point3D& pt, bool onGround);
+       bool OnAnyRunway(const SGGeod& pt, bool onGround);
        
        // Calculate the eta of a plane to the threshold.
        // For ground traffic this is the fastest they can get there.