Changeset 9005 for code/branches/presentation2011/src/orxonox/controllers/FormationController.cc

Timestamp:

Dec 19, 2011, 2:43:04 PM (13 years ago)

Author:

willis

Message:

fixed merging some merging bugs and some other bugs…

File:

• code/branches/presentation2011/src/orxonox/controllers/FormationController.cc (modified) (2 diffs)

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

@@ -383 +383 @@
     void FormationController::searchNewMaster()
     {
-
+        if (this->state_==SLAVE) 
+           return;
         if (!this->getControllableEntity())
             return;
@@ -588 +589 @@
     void FormationController::takeLeadOfFormation()
     {
-        if (!this->getControllableEntity())
+        if (!this->getControllableEntity() || this->state_==MASTER)
             return;
 
-        if (this->state_==MASTER) return;
         //search new Master, then take lead
-        if (this->state_==FREE)
+        if (this->state_==FREE && this->myMaster_==0)
         {
           searchNewMaster();