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

[flightgear.git] / src / AIModel / AIShip.hxx

diff --git a/src/AIModel/AIShip.hxx b/src/AIModel/AIShip.hxx
index c240dabf363a74e90128c045533518d3596e57ab..591aa616683bdce3a7ff8012fbff4934722dc957 100644 (file)
--- a/src/AIModel/AIShip.hxx
+++ b/src/AIModel/AIShip.hxx
@@ -42,7 +42,7 @@ public:
     virtual void unbind();
     virtual void update(double dt);
     void setFlightPlan(FGAIFlightPlan* f);
-    void setName(const string&);
+//    void setName(const string&);
     void setRudder(float r);
     void setRoll(double rl);
     void ProcessFlightPlan( double dt);
@@ -81,13 +81,13 @@ public:
     double _missed_range, _tow_angle, _wait_count, _missed_count,_wp_range;
     double _dt_count, _next_run;
 
-    FGAIFlightPlan::waypoint* prev; // the one behind you
-    FGAIFlightPlan::waypoint* curr; // the one ahead
-    FGAIFlightPlan::waypoint* next; // the next plus 1
+    FGAIWaypoint* prev; // the one behind you
+    FGAIWaypoint* curr; // the one ahead
+    FGAIWaypoint* next; // the next plus 1
 
 protected:
 
-    string _name; // The name of this ship.
+//    string _name; // The name of this ship.
 
 private: