Changeset 9269 for code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.h

Timestamp:

Jun 3, 2012, 4:33:13 PM (13 years ago)

Author:

landauf

Message:

merged presentation2012 to presentation2012merge

Location:

code/branches/presentation2012merge

Files:

• . (modified) (2 props)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/presentation2012merge

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

code/branches/presentation2012merge/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_;
 

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies