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

Timestamp:

May 14, 2013, 2:32:37 PM (12 years ago)

Author:

maxima

Message:

Just a few bug fixes.

Location:

code/branches/formationupdate/src/orxonox

Files:

• controllers/HumanController.cc (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)

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

@@ -102 +102 @@
 
         // commandslaves when Master of a formation
-        if (HumanController::localController_s && HumanController::localController_s->state_==MASTER)
+        if (HumanController::localController_s && HumanController::localController_s->state_==MASTER && FormationController::slaves_.size() > 0)
         {
             if (HumanController::localController_s->formationMode_ != ATTACK)

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

@@ -358 +358 @@
                         ControllableEntity* entity = slave->getControllableEntity();
 
-                        // delete the AIController
-                        slave->setControllableEntity(0);
-
-                        // set a new master within the formation
-                                        orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
-
-                                        // start to control a slave
-                                this->getPlayer()->startControl(entity);
+
+                        if(!entity->hasHumanController())
+                        {
+                                // delete the AIController
+                                slave->setControllableEntity(0);
+
+                                                // set a new master within the formation
+                                                orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
+
+                                                // start to control a slave
+                                                this->getPlayer()->startControl(entity);
+                        }
+                        else
+                        {
+                                this->getPlayer()->stopControl();
+                        }
+
                 }
                 else