Changeset 9619 for code/branches/formationupdate/src/orxonox/controllers/FormationController.h

Timestamp:

Apr 30, 2013, 3:55:12 PM (11 years ago)

Author:

maxima

Message:

New function SetNewMasterWithinFormation(FormationController), but it does not work yet.

File:

• code/branches/formationupdate/src/orxonox/controllers/FormationController.h (modified) (3 diffs)

code/branches/formationupdate/src/orxonox/controllers/FormationController.h

@@ -59 +59 @@
       static void passivebehaviour(const bool passive);
       static void formationsize(const int size);
-      void takeLeadOfFormation();
-      void loseMasterState();
+      void setNewMasterWithinFormation();
+      //void setNewMasterWithinFormation(FormationController* newMaster);
 
       inline void setFormationFlight(bool formation)
@@ -103 +103 @@
       FormationController* getMaster( void ) { return myMaster_; }
       FormationController* getThis( void ) { return this; }
+      FormationController* getSlave( void ) { return this->slaves_.back(); }
 
   protected:
@@ -133 +134 @@
       void searchNewMaster();
       void commandSlaves();
-      void setNewMasterWithinFormation();
+      void takeLeadOfFormation();
+      void loseMasterState();
 
       void freeSlaves();