Changeset 9621 for code/branches/formationupdate/src/orxonox/controllers

Timestamp:

May 7, 2013, 3:58:33 PM (12 years ago)

Author:

maxima

Message:

 

Location:

code/branches/formationupdate/src/orxonox/controllers

Files:

• FormationController.cc (modified) (2 diffs)
• FormationController.h (modified) (3 diffs)

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

@@ -535 +535 @@
 
 
+    // Sets newMaster as the new master within the formation. Called by the master.
     void FormationController::setNewMasterWithinFormation(FormationController* newMaster)
         {
@@ -565 +566 @@
 
   /**
-        @brief Frees all slaves form a master. Initiated by a master.
+        @brief Frees all slaves from a master. Initiated by a master.
     */
     void FormationController::freeSlaves()

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

@@ -59 +59 @@
       static void passivebehaviour(const bool passive);
       static void formationsize(const int size);
-      void setNewMasterWithinFormation();
       void setNewMasterWithinFormation(FormationController* newMaster);
 
@@ -100 +99 @@
       virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
 
-      /* Just for testing purposes: report the master. */
       FormationController* getMaster( void ) { return myMaster_; }
-      FormationController* getThis( void ) { return this; }
+      FormationController* getController( void ) { return this; }
       FormationController* getSlave( void ) { return this->slaves_.back(); }
 
@@ -136 +134 @@
       void takeLeadOfFormation();
       void loseMasterState();
+      void setNewMasterWithinFormation();
 
       void freeSlaves();