Changeset 9617 for code/branches/formationupdate/src

Timestamp:

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

Author:

maxima

Message:

The AIController of the new HumanController is deleted.

Location:

code/branches/formationupdate/src/orxonox

Files:

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

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

@@ -65 +65 @@
             virtual void changedControllableEntity() {}
 
-        protected:
             // don't use this directly, use getPlayer()->startControl(entity) (unless you know exactly what you do)
             inline void setControllableEntity(ControllableEntity* entity)

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

@@ -60 +60 @@
       static void formationsize(const int size);
       void takeLeadOfFormation();
+      void loseMasterState();
 
       inline void setFormationFlight(bool formation)
@@ -136 +137 @@
       void freeSlaves();
       void forceFreeSlaves();
-      void loseMasterState();
       void forceFreedom();
       bool forcedFree();

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

@@ -102 +102 @@
             //friend class, for mouselook
             friend class Map;
+            static HumanController* localController_s;
 
         protected:
-            static HumanController* localController_s;
             bool controlPaused_;
 

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

@@ -314 +314 @@
     bool Pawn::hasSlaves()
     {
-                for (ObjectList<FormationController>::iterator it =
+        for (ObjectList<FormationController>::iterator it =
                          ObjectList<FormationController>::begin();
                          it != ObjectList<FormationController>::end(); ++it )
@@ -327 +327 @@
     Controller* Pawn::getSlave(){
         for (ObjectList<FormationController>::iterator it =
-                                 ObjectList<FormationController>::begin();
-                                 it != ObjectList<FormationController>::end(); ++it )
+                        ObjectList<FormationController>::begin();
+                        it != ObjectList<FormationController>::end(); ++it )
         {
                 if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
@@ -360 +360 @@
                         ControllableEntity* entity = slave->getControllableEntity();
 
+                        // delete the AIController
+                        slave->setControllableEntity(0);
+
+
                         // set new Master
-                                        orxonox_cast<FormationController*>(slave)->takeLeadOfFormation();
+                                        orxonox_cast<FormationController*>(this->getController())->loseMasterState();
+
 
 
@@ -368 +373 @@
                          *
                          */
-                                        //slave->getPlayer()->stopControl();
 
                                         // start to control a slave
                                 this->getPlayer()->startControl(entity);
+
+                                        //orxonox_cast<FormationController*>(this->getController())->takeLeadOfFormation();
+
                 }
                 else