Changeset 9616 for code/branches

Timestamp:

Apr 23, 2013, 3:47:49 PM (12 years ago)

Author:

maxima

Message:

A few changes of the death function. Tried to change the master of the formation.

Location:

code/branches/formationupdate/src/orxonox

Files:

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

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

@@ -59 +59 @@
       static void passivebehaviour(const bool passive);
       static void formationsize(const int size);
+      void takeLeadOfFormation();
 
       inline void setFormationFlight(bool formation)
@@ -139 +140 @@
       bool forcedFree();
 
-      void takeLeadOfFormation();
       void masterAttacked(Pawn* originator);
 

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

@@ -318 +318 @@
                          it != ObjectList<FormationController>::end(); ++it )
                 {
-                        // checks if the dying Pawn has a slave
+                        // checks if the Pawn has a slave
                         if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
-                        {
-                                orxout(user_warning) << "This is a Slave of the HumanController: " << it->getThis() << endl;
                                 return true;
-                        }
                 }
-                orxout(user_warning) << "The HumanController has no slaves!" << endl;
                 return false;
     }
@@ -357 +353 @@
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
             {
-                /* Do different things if Pawn is the Master of a Formation
-                 * Doesn't work yet
-                 *
-                 */ if(this->hasSlaves())
+
+                // Do different things if Pawn is the Master of a Formation
+                if(this->hasSlaves())
                 {
-                                // start to control a slave
-                                this->getPlayer()->startControl(this->getSlave()->getControllableEntity());
+                        Controller* slave = this->getSlave();
+                        ControllableEntity* entity = slave->getControllableEntity();
+
+                        // set new Master
+                                        orxonox_cast<FormationController*>(slave)->takeLeadOfFormation();
+
+
+                        /* TO DO: - new Master is not set right
+                         *                - The slave still has a AIController
+                         *
+                         */
+                                        //slave->getPlayer()->stopControl();
+
+                                        // start to control a slave
+                                this->getPlayer()->startControl(entity);
                 }
-                 else{
-                         this->getPlayer()->stopControl();
-                 }
+                else
+                {
+                        this->getPlayer()->stopControl();
+                }
             }
             if (GameMode::isMaster())