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

Timestamp:

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

Author:

maxima

Message:

 

Location:

code/branches/formationupdate/src/orxonox

Files:

• controllers/FormationController.cc (modified) (2 diffs)
• controllers/FormationController.h (modified) (3 diffs)
• worldentities/pawns/Pawn.cc (modified) (6 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();

code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc

@@ -309 +309 @@
 
 
-    /* Two functions to find the slaves of a Pawn
-     *
-     */
+    // A function to check if this pawn's controller is the master of any formationcontroller
     bool Pawn::hasSlaves()
     {
@@ -318 +316 @@
                          it != ObjectList<FormationController>::end(); ++it )
                 {
-                        // checks if the Pawn has a slave
+                        // checks if the pawn's controller has a slave
                         if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
                                 return true;
@@ -325 +323 @@
     }
 
+    // A function that returns a slave of the pawn's controller
     Controller* Pawn::getSlave(){
         for (ObjectList<FormationController>::iterator it =
@@ -331 +330 @@
         {
                 if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
-                        return it->getThis();
+                        return it->getController();
         }
         return 0;
@@ -353 +352 @@
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
             {
-
-                // Do different things if Pawn is the Master of a Formation
+                // Start to control a new entity if you're the master of a formation
                 if(this->hasSlaves())
                 {
@@ -363 +361 @@
                         slave->setControllableEntity(0);
 
-
-                        // set new Master
+                        // set a new master within the formation
                                         orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
-                        //orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation();
-
-
-                        /* TO DO: - setNewMasterWithinFormation() with an argument.
-                         *                - set slave as the new master within the formation
-                         *
-                         */
 
                                         // start to control a slave
                                 this->getPlayer()->startControl(entity);
-
-
                 }
                 else