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

# Conflicts: # include/Game/Systems/DamageIndicatorSystem.h # src/Game/Systems/DamageIndicatorSystem.cpp # src/Game/Systems/SoundSystem.cpp
2016-02-25 10:30:35 +01:00
parent cca237b33f da1c7b3093
commit bc227c3d61
48 changed files with 916 additions and 273 deletions
@@ -14,6 +14,7 @@
 #include <glm/gtx/vector_angle.hpp>

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

 class DamageIndicatorSystem : public ImpureSystem
 {
@@ -32,16 +33,17 @@ private:
    struct DamageIndicatorStruct {
        EntityWrapper spriteEntity;
        glm::vec3 enemyPosition;
-        DamageIndicatorStruct(EntityWrapper entity, glm::vec3 pos)
-            : spriteEntity(entity)
+        DamageIndicatorStruct(EntityWrapper sprite, glm::vec3 pos)
+            : spriteEntity(sprite)
            , enemyPosition(pos) {}
    };
    std::vector<DamageIndicatorStruct> updateDamageIndicatorVector;
    float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
-    glm::vec3 DamageIndicatorTest(EntityWrapper player);

    //for tests
+#ifdef INDICATOR_TEST
+    glm::vec3 DamageIndicatorTest(EntityWrapper player);
    int m_TestVar = 0;
-    bool m_Testing = false;
+#endif
 };
 #endif