Changeset 9195 for code/branches/presentation2012/src

Timestamp:

May 18, 2012, 2:58:33 PM (12 years ago)

Author:

smerkli

Message:

merged branch pickup2012

Location:

code/branches/presentation2012

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/DamageBoostPickup.cc (copied) (copied from code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc)
• src/modules/pickup/items/DamageBoostPickup.h (copied) (copied from code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h)
• src/modules/pickup/items/SpeedPickup.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h

@@ -86 +86 @@
     class ShieldPickup;
     class ShrinkPickup;
-
+    class DamageBoostPickup;
 }
 

code/branches/presentation2012/src/modules/pickup/items/CMakeLists.txt

@@ -7 +7 @@
   ShieldPickup.cc
   ShrinkPickup.cc
+  DamageBoostPickup.cc
 )

code/branches/presentation2012/src/modules/pickup/items/SpeedPickup.h

@@ -112 +112 @@
         private:
             void initialize(void); //!< Initializes the member variables.
-            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceSHip, and throw an error message if the conversion fails.
+            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
 
             Timer durationTimer_; //!< Timer.

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

@@ -75 +75 @@
         this->lastHitOriginator_ = 0;
 
+        // set damage multiplier to default value 1, meaning nominal damage
+        this->damageMultiplier_ = 1;
+
         this->spawnparticleduration_ = 3.0f;
 
@@ -228 +231 @@
     void Pawn::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
+        //Applies multiplier given by the DamageBoost Pickup.
+        Pawn *test = dynamic_cast<Pawn *>(originator);
+        if( test != NULL )
+        {
+          damage *= originator->getDamageMultiplier();
+        }
+
+        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
             if (shielddamage >= this->getShieldHealth())

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

@@ -162 +162 @@
                 { return this->numexplosionchunks_; }
 
+            // These are used with the Damage Boost Pickup to use the damage multiplier.
+            inline void setDamageMultiplier(float multiplier)
+                { this->damageMultiplier_ = multiplier; }
+            inline float getDamageMultiplier()
+                { return this->damageMultiplier_; }
+
+
             virtual void startLocalHumanControl();
 
@@ -208 +215 @@
             float reloadWaitCountdown_;
 
+            // Modifier
+            float damageMultiplier_; // Used by the Damage Boost Pickup.
+
             WeakPtr<Pawn> lastHitOriginator_;