Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

2016-03-09 14:47:24 +01:00
parent 6f69b52358 ee4db3c12f
commit 877defdfee
3 changed files with 17 additions and 6 deletions
@@ -15,6 +15,7 @@

 #include "Rendering/Util/CommonFunctions.h"
 //#define INDICATOR_TEST
+#include "Core/ConfigFile.h"

 class DamageIndicatorSystem : public ImpureSystem
 {
@@ -40,6 +41,8 @@ private:
    std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
    float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);

+    bool m_NetworkEnabled;
+
    //for tests
 #ifdef INDICATOR_TEST
    glm::vec3 DamageIndicatorTest(EntityWrapper player);