Changeset 9583 for code/branches/formationupdate/src

Timestamp:

Mar 26, 2013, 3:30:12 PM (12 years ago)

Author:

smerkli

Message:

Added a check when dying to find another pawn in the
same 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

@@ -98 +98 @@
       virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
 
+      /* Just for testing purposes: report the master. */
+      FormationController* getMaster( void ) { return myMaster_; }
+
   protected:
       bool formationFlight_;
@@ -159 +162 @@
 
       void setTarget(Pawn* target);
+
       void searchNewTarget();
       void forgetTarget();

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

@@ -47 +47 @@
 #include "weaponsystem/WeaponSet.h"
 
+#include "controllers/FormationController.h"
+
 namespace orxonox
 {
@@ -308 +310 @@
     void Pawn::death()
     {
+        /* TEST TEST This is used to find out if the current pawn is also 
+         * the master of the formulation.
+         *
+         * NOTE: This does not yet check if the current pawn is actually 
+         *       the humanplayer or not!
+         */
+        for (ObjectList<FormationController>::iterator it = 
+          ObjectList<FormationController>::begin(); 
+          it != ObjectList<FormationController>::end(); ++it )
+        {
+          orxout(user_warning) << "Test! Master: " << it->getMaster() 
+            << " My controller: " << this->getPlayer()->getController() << endl;
+        }
+        /* TEST TEST */
+
+            
+
+
         this->setHealth(1);
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))