fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem

2016-02-11 23:44:20 +01:00
parent 7cae84d4ee
commit 44a73ef883
4 changed files with 15 additions and 12 deletions
@@ -21,8 +21,8 @@ public:
    DamageIndicatorSystem(SystemParams params);

 private:
-    EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_DamageTakenFromPlayer;
-    bool OnPlayerDamageTaken(Events::PlayerDamage& e);
+    EventRelay<DamageIndicatorSystem, Events::PlayerDamage> m_EPlayerDamage;
+    bool OnPlayerDamage(Events::PlayerDamage& e);

    EventRelay<DamageIndicatorSystem, Events::SetCamera> m_ESetCamera;
    bool OnSetCamera(const Events::SetCamera& e);