Changeset 9613

Timestamp:

Apr 9, 2013, 3:49:06 PM (12 years ago)

Author:

maxima

Message:

A few changes to find the slaves of a pawn.

Location:

code/branches/formationupdate

Files:

• data/levels/maxim.oxw (modified) (1 diff)
• src/orxonox/controllers/FormationController.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/formationupdate/data/levels/maxim.oxw

@@ -3 +3 @@
  description = "Intelligent Formation"
  tags = "test"
- screenshot = "presentationxi.png"
 />
 

code/branches/formationupdate/src/orxonox/controllers/FormationController.h

@@ -100 +100 @@
       /* Just for testing purposes: report the master. */
       FormationController* getMaster( void ) { return myMaster_; }
+      FormationController* getThis( void ) { return this; }
 
   protected:

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

@@ -308 +308 @@
     }
 
+    // Two functions to find the slaves of a Pawn
+    bool Pawn::hasSlaves()
+    {
+        /* TEST TEST This is used to find out if the current pawn is also
+                 * the master of the formation and to find his slaves.
+                 *
+                 */
+                for (ObjectList<FormationController>::iterator it =
+                         ObjectList<FormationController>::begin();
+                         it != ObjectList<FormationController>::end(); ++it )
+                {
+                        // checks if the dying Pawn has a slave
+                        if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
+                        {
+                                orxout(user_warning) << "This is a Slave of the HumanController: " << it->getThis() << endl;
+                                return true;
+                        }
+                }
+                return false;
+                /* TEST TEST */
+    }
+
+    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->getThis();
+        }
+        return 0;
+    }
+
+
     void Pawn::death()
     {
-        /* TEST TEST This is used to find out if the current pawn is also 
-         * the master of the formation.
-         *
-         * 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_))
@@ -339 +355 @@
                 this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
 
+
             if (this->getPlayer() && this->getPlayer()->getControllableEntity() == this)
+            {
+                if(this->hasSlaves())
+                {
+                                // start to control a slave
+                                this->getPlayer()->startControl(this->getSlave()->getControllableEntity());
+                }
                 this->getPlayer()->stopControl();
-
-            if (GameMode::isMaster())
+            }
+            /*if (GameMode::isMaster())
             {
 //                this->deathEffect();
                 this->goWithStyle();
-            }
+            }*/
         }
     }

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

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