Merge commit 'refs/merge-requests/1552' of git@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 cf7f6c404e5045d7d54acd5c36fbb3f38c4cea13..c240dabf363a74e90128c045533518d3596e57ab 100644 (file)
--- a/src/AIModel/AIShip.hxx
+++ b/src/AIModel/AIShip.hxx
@@ -61,18 +61,25 @@ public:
     void setRudderConstant(double rc);
     void setSpeedConstant(double sc);
     void setFixedTurnRadius(double ft);
+    void setTunnel(bool t);
+    void setInitialTunnel(bool t);
+
     void setWPNames();
+    void setWPPos();
     double sign(double x);
 
     bool _hdg_lock;
     bool _serviceable;
     bool _waiting;
     bool _new_waypoint;
+    bool _tunnel, _initial_tunnel;
+    bool _restart;
 
     virtual const char* getTypeString(void) const { return "ship"; }
     double _rudder_constant, _speed_constant, _hdg_constant, _limit ;
     double _elevation_m, _elevation_ft;
-    double _missed_range, _tow_angle, _wait_count;
+    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
@@ -89,13 +96,14 @@ private:
     virtual void reinit() { init(); }
 
     void setRepeat(bool r);
+    void setRestart(bool r);
     void setMissed(bool m);
 
     void setServiceable(bool s);
     void Run(double dt);
     void setStartTime(const string&);
     void setUntilTime(const string&);
-    void setWPPos();
+    //void setWPPos();
     void setWPAlt();
     void setXTrackError();
 
@@ -115,9 +123,7 @@ private:
 
     double _roll_constant, _roll_factor;
     double _sp_turn_radius_ft, _rd_turn_radius_ft, _fixed_turn_radius;
-    double _wp_range, _old_range, _range_rate;
-    double _dt_count, _missed_count;
-    double _next_run;
+    double _old_range, _range_rate;
     double _missed_time_sec;
     double _start_sec;
     double _day;
@@ -125,6 +131,7 @@ private:
     double _lead_angle_gain, _lead_angle_limit, _proportion;
     double _course;
     double _xtrack_error;
+    double _curr_alt, _prev_alt;
 
     string _prev_name, _curr_name, _next_name;
     string _path;
@@ -133,6 +140,7 @@ private:
     bool _repeat;
     bool _fp_init;
     bool _missed;
+   
 
 };