Revert "Merge remote-tracking branch 'origin/master' into SniperSprint"

This reverts commit 62653cf65d, reversing changes made to b81bb9eeea.
2016-03-02 16:58:24 +01:00
parent 4e68f9063b
commit a20ef0504a
195 changed files with 2303 additions and 6805 deletions
@@ -27,16 +27,17 @@ public:
 private:
    bool m_NetworkEnabled;

-   // methods which will take care of specific events
+    //methods which will take care of specific events
    EventRelay<HealthSystem, Events::PlayerDamage> m_EPlayerDamage;
    bool HealthSystem::OnPlayerDamaged(Events::PlayerDamage& e);
    EventRelay<HealthSystem, Events::PlayerHealthPickup> m_EPlayerHealthPickup;
    bool HealthSystem::OnPlayerHealthPickup(Events::PlayerHealthPickup& e);
    EventRelay<HealthSystem, Events::InputCommand> m_InputCommand;
    bool HealthSystem::OnInputCommand(Events::InputCommand& e);
-
+    
    //vector which will keep track of health changes
    std::vector<std::tuple<EntityID, double>> m_DeltaHealthVector;
+
 };

 #endif