Changeset 6884 for code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.h

Timestamp:

May 10, 2010, 4:23:29 PM (14 years ago)

Author:

benedict

Message:

did the shield pickup. upload for testing

File:

• code/branches/ppspickups3/src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

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

@@ -73 +73 @@
                 { return this->initialHealth_; }
 
+            inline void setShieldHealth(float shieldHealth)
+            { this->shieldHealth_ = shieldHealth; }
+            inline float getShieldHealth()
+            { return this->shieldHealth_; }
+            
+            inline void setShieldAbsorption(float shieldAbsorption)
+            { this->shieldAbsorption_ = shieldAbsorption; }
+            inline float getShieldAbsorption()
+            { return this->shieldAbsorption_; }
+
             inline ControllableEntity* getLastHitOriginator() const
                 { return this->lastHitOriginator_; }
@@ -141 +151 @@
             float maxHealth_;
             float initialHealth_;
+            float shieldHealth_;
+            float shieldAbsorption_; // Has to be between 0 and 1
 
             Pawn* lastHitOriginator_;