Changeset 9625 for code/trunk/src/orxonox/worldentities/pawns

Timestamp:

May 21, 2013, 3:12:21 PM (12 years ago)

Author:

smerkli

Message:

Merged Maxim's Branch back into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (4 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -47 +47 @@
 #include "weaponsystem/WeaponSet.h"
 
+#include "controllers/FormationController.h"
+
 namespace orxonox
 {
@@ -306 +308 @@
     }
 
+
     void Pawn::death()
     {
@@ -320 +323 @@
 
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
-                this->getPlayer()->stopControl();
-
+            {
+                // Start to control a new entity if you're the master of a formation
+                if(this->hasSlaves())
+                {
+                        Controller* slave = this->getSlave();
+                        ControllableEntity* entity = slave->getControllableEntity();
+
+
+                        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
+                {
+                        this->getPlayer()->stopControl();
+                }
+            }
             if (GameMode::isMaster())
             {
@@ -468 +499 @@
     }
 
+
+    // A function to check if this pawn's controller is the master of any formationcontroller
+    bool Pawn::hasSlaves()
+    {
+        for (ObjectList<FormationController>::iterator it =
+                         ObjectList<FormationController>::begin();
+                         it != ObjectList<FormationController>::end(); ++it )
+                {
+                        // checks if the pawn's controller has a slave
+                        if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
+                                return true;
+                }
+                return false;
+    }
+
+    // A function that returns a slave of the pawn's controller
+    Controller* Pawn::getSlave(){
+        for (ObjectList<FormationController>::iterator it =
+                        ObjectList<FormationController>::begin();
+                        it != ObjectList<FormationController>::end(); ++it )
+        {
+                if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
+                        return it->getController();
+        }
+        return 0;
+    }
+
+
+
 }

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -185 +185 @@
 
             virtual void death();
+            virtual bool hasSlaves();
+            virtual Controller* getSlave();
             virtual void goWithStyle();
             virtual void deatheffect();