Changeset 6850 for code/branches/ai/src/orxonox/controllers/ArtificialController.h

Timestamp:

May 3, 2010, 6:41:43 PM (14 years ago)

Author:

solex

Message:

master/slave interaction of bots now correct - getting closer to formation flight

File:

• code/branches/ai/src/orxonox/controllers/ArtificialController.h (modified) (2 diffs)

code/branches/ai/src/orxonox/controllers/ArtificialController.h

@@ -51 +51 @@
             inline int getTeam() const
                 { return this->team_; }
-            //virtual void changedControllableEntity();
+            virtual void changedControllableEntity();
 
 
         protected:
+
+            int team_;
+            int freedomCount_;
+            enum State {SLAVE, MASTER, FREE};
+            State state_;
+            std::list<ArtificialController*> slaves_;
+
             void targetDied();
 
             void moveToPosition(const Vector3& target);
+            //void speedToTargetPosition(const Vector3& target);
             void moveToTargetPosition();
 
-            enum State {SLAVE, MASTER, FREE};
             int getState();
-            std::list<ArtificialController*> slaves_;
+
             void unregisterSlave();
             void searchNewMaster();
             void commandSlaves();
             void setNewMasterWithinFormation();
-            void freeAllSlaves();
+            void freeSlaves();
+            void forceFreeSlaves();
             void loseMasterState();
+            void forceFreedom();
+            bool forcedFree();
 
             ArtificialController *myMaster_;
@@ -90 +100 @@
             bool bShooting_;
 
-
-            State state_;
-            int team_;
-
         private:
     };