Changeset 10746 for code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Nov 1, 2015, 10:25:57 PM (8 years ago)

Author:

fvultier

Message:

 

File:

• code/branches/fabienHS15/src/orxonox/worldentities/pawns/Pawn.cc (modified) (6 diffs)

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

@@ -61 +61 @@
 
         this->bAlive_ = true;
-        this->bShieldRecharging_ = false;
 
         this->health_ = 0;
@@ -71 +70 @@
         this->maxShieldHealth_ = 100; //otherwise shield might increase to float_max
         this->shieldAbsorption_ = 0.5;
-
         this->shieldRechargeRate_ = 0;
         this->shieldRechargeWaitTime_ = 1.0f;
@@ -153 +151 @@
     void Pawn::registerVariables()
     {
-        registerVariable(this->bAlive_,           VariableDirection::ToClient);
-        registerVariable(this->health_,           VariableDirection::ToClient);
-        registerVariable(this->maxHealth_,        VariableDirection::ToClient);
-        registerVariable(this->shieldHealth_,     VariableDirection::ToClient);
-        registerVariable(this->maxShieldHealth_,  VariableDirection::ToClient);
-        registerVariable(this->shieldAbsorption_, VariableDirection::ToClient);
-        registerVariable(this->bShieldRecharging_,          VariableDirection::ToServer);
-        registerVariable(this->aimPosition_,      VariableDirection::ToServer);  // For the moment this variable gets only transfered to the server
+        registerVariable(this->bAlive_,            VariableDirection::ToClient);
+        registerVariable(this->health_,            VariableDirection::ToClient);
+        registerVariable(this->maxHealth_,         VariableDirection::ToClient);
+        registerVariable(this->shieldHealth_,      VariableDirection::ToClient);
+        registerVariable(this->maxShieldHealth_,   VariableDirection::ToClient);
+        registerVariable(this->shieldAbsorption_,  VariableDirection::ToClient);
+        registerVariable(this->aimPosition_,       VariableDirection::ToServer);  // For the moment this variable gets only transfered to the server
     }
 
@@ -167 +164 @@
         SUPER(Pawn, tick, dt);
 
-        this->bShieldRecharging_ = false;
-
+        // Recharge the shield
         // TODO: use the existing timer functions instead
         if(this->shieldRechargeWaitCountdown_ > 0)
@@ -252 +248 @@
         if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
+            // Health-damage cannot be absorbed by shields.
+            // Shield-damage only reduces shield health. 
+            // Normal damage can be (partially) absorbed by shields.
+
             if (shielddamage >= this->getShieldHealth())
             {
@@ -480 +480 @@
     }
 
-    void Pawn::reload()
-    {
-        this->bShieldRecharging_ = true;
-    }
-
     void Pawn::postSpawn()
     {