Changeset 9619 for code/branches/formationupdate/src/orxonox/worldentities

Timestamp:

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

Author:

maxima

Message:

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

File:

• code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -365 +365 @@
 
                         // set new Master
-                                        orxonox_cast<FormationController*>(this->getController())->loseMasterState();
-
-
-
-                        /* TO DO: - new Master is not set right
-                         *                - The slave still has a AIController
+                                        //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
                          *
                          */
@@ -377 +377 @@
                                 this->getPlayer()->startControl(entity);
 
-                                        //orxonox_cast<FormationController*>(this->getController())->takeLeadOfFormation();
 
                 }