Merge pull request #113 from teamfisk/Menu-Tobias

Menu tobias
2016-02-19 13:16:50 +01:00
parent a141da3d8c 6e5335a266
commit 2ac584bafb
36 changed files with 1044 additions and 664 deletions
@@ -27,17 +27,16 @@ 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