Changeset 8187 for code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Apr 4, 2011, 3:45:09 PM (13 years ago)

Author:

simonmie

Message:

Added initialShieldHealth and minor changes

File:

• code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

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

@@ -129 +129 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+
         XMLPortParam(Pawn, "maxshieldhealth", setMaxShieldHealth, getMaxShieldHealth, xmlelement, mode).defaultValues(100);
+        XMLPortParam(Pawn, "initialshieldhealth", setInitialShieldHealth, getInitialShieldHealth, xmlelement, mode).defaultValues(0);
 
 /////// end me
@@ -227 +229 @@
     void Pawn::setHealth(float health)
     {
-        this->health_ = std::min(health, this->maxHealth_);
+        this->health_ = std::min(health, this->maxHealth_); //Health can't be set to a value bigger than maxHealth, otherwise it will be reduced at first hit
     }