Changeset 9625 for code/trunk

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)
• data/levels/maxim.oxw (copied) (copied from code/branches/formationupdate/data/levels/maxim.oxw)
• src/orxonox/controllers/Controller.h (modified) (1 diff)
• src/orxonox/controllers/FormationController.cc (modified) (1 diff)
• src/orxonox/controllers/FormationController.h (modified) (4 diffs)
• src/orxonox/controllers/HumanController.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (4 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/trunk/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/trunk/src/orxonox/controllers/FormationController.cc

@@ -535 +535 @@
 
 
+    // Sets newMaster as the new master within the formation. Called by the master.
+    void FormationController::setNewMasterWithinFormation(FormationController* newMaster)
+        {
+            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_;
+                newMaster->myMaster_ = 0;
+
+                for(std::vector<FormationController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
+                {
+                    (*it)->myMaster_ = newMaster;
+                }
+            }
+
+            this->slaves_.clear();
+            this->specificMasterAction_ = NONE;
+            this->state_ = FREE;
+        }
+
+
+
   /**
-        @brief Frees all slaves form a master. Initiated by a master.
+        @brief Frees all slaves from a master. Initiated by a master.
     */
     void FormationController::freeSlaves()

code/trunk/src/orxonox/controllers/FormationController.h

@@ -59 +59 @@
       static void passivebehaviour(const bool passive);
       static void formationsize(const int size);
+      void setNewMasterWithinFormation(FormationController* newMaster);
 
       inline void setFormationFlight(bool formation)
@@ -98 +99 @@
       virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
 
+      FormationController* getMaster( void ) { return myMaster_; }
+      FormationController* getController( void ) { return this; }
+      FormationController* getSlave( void ) { return this->slaves_.back(); }
+
   protected:
       bool formationFlight_;
@@ -127 +132 @@
       void searchNewMaster();
       void commandSlaves();
+      void takeLeadOfFormation();
+      void loseMasterState();
       void setNewMasterWithinFormation();
 
       void freeSlaves();
       void forceFreeSlaves();
-      void loseMasterState();
       void forceFreedom();
       bool forcedFree();
 
-      void takeLeadOfFormation();
       void masterAttacked(Pawn* originator);
 
@@ -159 +164 @@
 
       void setTarget(Pawn* target);
+
       void searchNewTarget();
       void forgetTarget();

code/trunk/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/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();