Set the format default to float instead of int.

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

diff --git a/src/AIModel/AIManager.hxx b/src/AIModel/AIManager.hxx
index 8433b7ab07864d521c464ae7f1efc9ea63cfb71a..619d91961d60bb9d0a6c805f1bf94d282e17b4fc 100644 (file)
--- a/src/AIModel/AIManager.hxx
+++ b/src/AIModel/AIManager.hxx
@@ -52,11 +52,6 @@ private:
     ai_list_type ai_list;
     ai_list_iterator ai_list_itr;
 
-    // array of already-assigned ID's
-    typedef vector <int> id_vector_type;
-    id_vector_type ids;                    
-    id_vector_type::iterator id_itr;
-
 public:
 
     FGAIManager();
@@ -67,16 +62,13 @@ public:
     void unbind();
     void update(double dt);
 
-    int assignID();
-    void freeID(int ID);
-
-    int createBallistic( FGAIModelEntity *entity );
-    int createAircraft( FGAIModelEntity *entity );
-    int createThermal( FGAIModelEntity *entity );
-    int createStorm( FGAIModelEntity *entity );
-    int createShip( FGAIModelEntity *entity );
+    void* createBallistic( FGAIModelEntity *entity );
+    void* createAircraft( FGAIModelEntity *entity );
+    void* createThermal( FGAIModelEntity *entity );
+    void* createStorm( FGAIModelEntity *entity );
+    void* createShip( FGAIModelEntity *entity );
 
-    void destroyObject( int ID );
+    void destroyObject( void* ID );
 
     inline double get_user_latitude() { return user_latitude; }
     inline double get_user_longitude() { return user_longitude; }
@@ -86,14 +78,17 @@ public:
     inline double get_user_yaw() { return user_yaw; }
     inline double get_user_speed() {return user_speed; }
 
-    void processScenario( string filename );
-    int getNum( FGAIBase::object_type ot);
+    inline int getNum( FGAIBase::object_type ot ) {
+      return (0 < ot && ot < FGAIBase::MAX_OBJECTS) ? numObjects[ot] : numObjects[0];
+    }
+
+    void processScenario( string &filename );
 
 private:
 
     bool initDone;
     bool enabled;
-    int numObjects;
+    int numObjects[FGAIBase::MAX_OBJECTS];
     SGPropertyNode* root;
     SGPropertyNode* wind_from_down_node;
     string scenario_filename;