David Culp:

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

diff --git a/src/AIModel/AIBase.hxx b/src/AIModel/AIBase.hxx
index ac859e1ff61ec177fcc4a2db80a80c726ab86f80..4d1f630b1915516948a57e8ea3e3a1e342c2e88f 100644 (file)
--- a/src/AIModel/AIBase.hxx
+++ b/src/AIModel/AIBase.hxx
@@ -36,6 +36,7 @@ SG_USING_STD(list);
 class FGAIManager;
 class FGAIFlightPlan;
 
+
 struct ParkPosition {
   ParkPosition(const ParkPosition& pp)
     : name(pp.name), offset(pp.offset), heading_deg(pp.heading_deg)
@@ -69,7 +70,8 @@ typedef struct {
    double azimuth;            // used by ballistic objects
    double elevation;          // used by ballistic objects
    double rudder;             // used by ship objects
-   double strength;           // used by thermal and storm objects
+   double strength;           // used by thermal 
+   double turb_strength;      // used by storm objects
    double diameter;           // used by thermal and storm objects
    double height_msl;         // used by thermal and storm objects
    double eda;                // used by ballistic objects
@@ -91,6 +93,12 @@ typedef struct {
    string pennant_number;     // used by carrier objects
    string acType;             // used by aircraft objects
    string company;            // used by aircraft objects
+   string TACAN_channel_ID;   // used by carrier objects
+   double max_lat;            // used by carrier objects
+   double min_lat;            // used by carrier objects
+   double max_long;            // used by carrier objects
+   double min_long;            // used by carrier objects
+   
 } FGAIModelEntity;
 
 
@@ -101,7 +109,7 @@ public:
     FGAIBase();
     virtual ~FGAIBase();
     virtual void update(double dt);
-    inline Point3D GetPos() { return(pos); }
+    inline const Point3D& GetPos() const { return(pos); }
 
     enum object_type { otNull = 0, otAircraft, otShip, otCarrier, otBallistic,
                        otRocket, otStorm, otThermal, otStatic,
@@ -123,8 +131,8 @@ public:
     void setYoffset( double y_offset );
     void setZoffset( double z_offset );
 
+    int getID() const;
 
-    void* getID();
     void setDie( bool die );
     bool getDie();
 
@@ -188,6 +196,11 @@ protected:
     object_type _otype;
     int index;
 
+    static int _newAIModelID();
+
+private:
+    const int _refID;
+
 public:
 
     object_type getType();
@@ -223,8 +236,6 @@ public:
     static const double e;
     static const double lbs_to_slugs;
 
-    int _getID() const;
-
     inline double _getRange() { return range; };
   ssgBranch * load3DModel(const string& fg_root, 
                          const string &path,
@@ -273,8 +284,6 @@ inline bool FGAIBase::getDie() { return delete_me; }
 
 inline FGAIBase::object_type FGAIBase::getType() { return _otype; }
 
-inline void* FGAIBase::getID() { return this; }
-
 
 
 #endif // _FG_AIBASE_HXX