X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIShip.hxx;h=009b735f58311f92944ee7d0c03d9832e2dc52c6;hb=d035fdf3a949e62f0c8e772e100d14087b6d4ba9;hp=0526df32ae7a3f7b4347aa9bc3439f998b1f335e;hpb=6fcd9f967bf659cc0dcf7288fc82a111e3eaee24;p=flightgear.git

diff --git a/src/AIModel/AIShip.hxx b/src/AIModel/AIShip.hxx
index 0526df32a..009b735f5 100644
--- a/src/AIModel/AIShip.hxx
+++ b/src/AIModel/AIShip.hxx
@@ -39,10 +39,10 @@ public:
 
     virtual bool init(bool search_in_AI_path=false);
     virtual void bind();
-    virtual void unbind();
     virtual void update(double dt);
+    virtual void reinit();
+
     void setFlightPlan(FGAIFlightPlan* f);
-    void setName(const string&);
     void setRudder(float r);
     void setRoll(double rl);
     void ProcessFlightPlan( double dt);
@@ -52,64 +52,65 @@ public:
     void YawTo(double angle);
     void ClimbTo(double altitude);
     void TurnTo(double heading);
-    void setCurrName(const string&);
-    void setNextName(const string&);
-    void setPrevName(const string&);
+    void setCurrName(const std::string&);
+    void setNextName(const std::string&);
+    void setPrevName(const std::string&);
     void setLeadAngleGain(double g);
     void setLeadAngleLimit(double l);
     void setLeadAngleProp(double p);
     void setRudderConstant(double rc);
     void setSpeedConstant(double sc);
     void setFixedTurnRadius(double ft);
+    void setRollFactor(double rf);
+
+    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;
-
+    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, _wp_range;
+    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.
-
 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 setStartTime(const std::string&);
+    void setUntilTime(const std::string&);
     //void setWPPos();
     void setWPAlt();
     void setXTrackError();
 
     SGGeod wppos;
 
-    const SGMaterial* _material;
-
     double getRange(double lat, double lon, double lat2, double lon2) const;
     double getCourse(double lat, double lon, double lat2, double lon2) const;
     double getDaySeconds();
-    double processTimeString(const string& time);
+    double processTimeString(const std::string& time);
 
     bool initFlightPlan();
     bool advanceFlightPlan (double elapsed_sec, double day_sec);
@@ -119,8 +120,6 @@ private:
     double _roll_constant, _roll_factor;
     double _sp_turn_radius_ft, _rd_turn_radius_ft, _fixed_turn_radius;
     double _old_range, _range_rate;
-    double _dt_count, _missed_count;
-    double _next_run;
     double _missed_time_sec;
     double _start_sec;
     double _day;
@@ -130,13 +129,14 @@ private:
     double _xtrack_error;
     double _curr_alt, _prev_alt;
 
-    string _prev_name, _curr_name, _next_name;
-    string _path;
-    string _start_time, _until_time;
+    std::string _prev_name, _curr_name, _next_name;
+    std::string _path;
+    std::string _start_time, _until_time;
 
     bool _repeat;
     bool _fp_init;
     bool _missed;
+   
 
 };