Merge pull request #81 from teamfisk/HealthPickup

Health pickup
2016-02-08 11:50:47 +01:00
parent 70f8237a16 ce22854168
commit 5987751add
11 changed files with 460 additions and 2 deletions
@@ -18,7 +18,7 @@ bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e)
    ComponentWrapper cHealth = e.Player["Health"];
    double& health = cHealth["Health"];
    health -= e.Damage;
-    
+
    if (health <= 0.0) {
        Events::PlayerDeath ePlayerDeath;
        ePlayerDeath.Player = e.Player;
@@ -33,8 +33,8 @@ bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e)
 {
    ComponentWrapper cHealth = e.Player["Health"];
    double& health = cHealth["Health"];
-    //NOTE: its possible to get more than MaxHealth health
    health += e.HealthAmount;
+    health = std::min(health, (double)cHealth["MaxHealth"]);

    return true;
 }