Changeset 9663 for code/trunk/src/orxonox

Timestamp:

Aug 25, 2013, 10:03:25 AM (11 years ago)

Author:

landauf

Message:

replaced tabs with spaces

Location:

code/trunk/src/orxonox

Files:

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

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

@@ -542 +542 @@
             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);
-                                }
+                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;

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

@@ -324 +324 @@
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
             {
-                // 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();
-                }
+                // 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())
@@ -503 +503 @@
     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;
+        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;
+        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;
     }