Merge remote-tracking branch 'origin/master' into HealthPickup

2016-02-08 10:22:35 +01:00
parent 4103c878ec 40788c7400
commit f8e514d21e
9 changed files with 33 additions and 72 deletions
@@ -26,7 +26,7 @@ private:
    EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
    bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
    EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
-    bool HealthSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup& e);
+    bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e);

    //vector which will keep track of health changes
    std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;