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

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

diff --git a/src/AIModel/AICarrier.hxx b/src/AIModel/AICarrier.hxx
index 082e111533d181f8e1833dbf0a9b750609d1f6db..da3380502fc44e5e045b7c48b5e9b39071052162 100644 (file)
--- a/src/AIModel/AICarrier.hxx
+++ b/src/AIModel/AICarrier.hxx
@@ -24,9 +24,6 @@
 #include <string>
 #include <list>
 
-#include <osg/Referenced>
-#include <osg/Node>
-
 #include <simgear/compiler.h>
 
 using std::string;
@@ -60,13 +57,15 @@ public:
     void setMinLat( double deg );
     void setMaxLong( double deg );
     void setMinLong( double deg );
+    void setMPControl( bool c );
+    void setAIControl( bool c );
     void TurnToLaunch();
+    void TurnToRecover();
     void TurnToBase();
     void ReturnToBox();
     bool OutsideBox();
 
     bool init(bool search_in_AI_path=false);
-    void initModel(osg::Node *node);
 
     virtual const char* getTypeString(void) const { return "carrier"; }
 
@@ -96,8 +95,7 @@ private:
     double rel_wind_from_deg;
 
 
-    list<string> wire_objects;        // List of wire object names
-    list<string> catapult_objects;    // List of catapult object names
+
     list<ParkPosition> ppositions;    // List of positions where an aircraft can start.
     string sign;                      // The sign of this carrier.
 
@@ -108,6 +106,7 @@ private:
     double angle;
     int source;             // the flols light which is visible at the moment
     bool wave_off_lights;
+    bool in_to_wind;
 
     // these are for maneuvering the carrier
     SGGeod mOpBoxPos;
@@ -121,8 +120,11 @@ private:
     double base_course, base_speed;
 
     bool turn_to_launch_hdg;
+    bool turn_to_recovery_hdg;
+    bool turn_to_base_course;
     bool returning;      // set if the carrier is returning to an operating box
     bool InToWind();     // set if the carrier is in to wind
+    bool MPControl, AIControl;
 
 
     SGPropertyNode_ptr _longitude_node;