Changeset 9620 for code/branches

Timestamp:

Apr 30, 2013, 4:04:26 PM (12 years ago)

Author:

maxima

Message:

setNewMasterWithInFormation works!

Location:

code/branches/formationupdate/src/orxonox

Files:

• controllers/FormationController.cc (modified) (2 diffs)
• controllers/FormationController.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)

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

@@ -534 +534 @@
     }
 
-    /*
+
     void FormationController::setNewMasterWithinFormation(FormationController* newMaster)
         {
-            if(this->state_ != MASTER) return;
+            if(this->state_ != MASTER || newMaster->myMaster_ != this) return;
 
             if (!this->slaves_.empty())
             {
+                                std::vector<FormationController*>::iterator it2 = std::find(this->slaves_.begin(), this->slaves_.end(), newMaster);
+                                if (it2 != this->slaves_.end())
+                                {
+                                         this->slaves_.erase(it2);
+                                }
+
                 newMaster->state_ = MASTER;
                 newMaster->slaves_ = this->slaves_;
@@ -555 +561 @@
             this->state_ = FREE;
         }
-     */
+
 
 

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

@@ -60 +60 @@
       static void formationsize(const int size);
       void setNewMasterWithinFormation();
-      //void setNewMasterWithinFormation(FormationController* newMaster);
+      void setNewMasterWithinFormation(FormationController* newMaster);
 
       inline void setFormationFlight(bool formation)

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

@@ -365 +365 @@
 
                         // set new Master
-                                        //orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
-                        orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation();
+                                        orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
+                        //orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation();