Changeset 9624 for code/branches/formationupdate

Timestamp:

May 14, 2013, 3:42:22 PM (11 years ago)

Author:

maxima

Message:

 

File:

• code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc (modified) (3 diffs)

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

@@ -309 +309 @@
 
 
-    // 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;
-    }
-
-
     void Pawn::death()
     {
@@ -348 +321 @@
             if (this->getGametype())
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
-
 
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
@@ -527 +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;
+    }
+
+
+
 }