From af68236e7186774ba25111523a5cbacb4860eaab Mon Sep 17 00:00:00 2001
From: verysecrethero <hnorthh@gmail.com>
Date: Wed, 24 Feb 2016 13:58:05 +0100
Subject: [PATCH] now using a define INDICATOR_TEST to activate the
 DamageIndicatorSystem test.

---
 include/Game/Systems/DamageIndicatorSystem.h | 6 ++++--
 src/Game/Systems/DamageIndicatorSystem.cpp   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/Game/Systems/DamageIndicatorSystem.h b/include/Game/Systems/DamageIndicatorSystem.h
index 49ae249c..ae9ba195 100644
--- a/include/Game/Systems/DamageIndicatorSystem.h
+++ b/include/Game/Systems/DamageIndicatorSystem.h
@@ -14,6 +14,7 @@
 #include <glm/gtx/vector_angle.hpp>
 
 #include "Rendering/Util/CommonFunctions.h"
+//#define INDICATOR_TEST
 
 class DamageIndicatorSystem : public ImpureSystem
 {
@@ -40,8 +41,9 @@ private:
     float CalculateAngle(EntityWrapper player, glm::vec3 enemyPos);
 
     //for tests
-    int m_TestVar = 0;
-    bool m_Testing = false;
+#ifdef INDICATOR_TEST
     glm::vec3 DamageIndicatorTest(EntityWrapper player);
+    int m_TestVar = 0;
+#endif
 };
 #endif
diff --git a/src/Game/Systems/DamageIndicatorSystem.cpp b/src/Game/Systems/DamageIndicatorSystem.cpp
index 65e1caf0..92fbe607 100644
--- a/src/Game/Systems/DamageIndicatorSystem.cpp
+++ b/src/Game/Systems/DamageIndicatorSystem.cpp
@@ -42,9 +42,9 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
 
     glm::vec3 inflictorPos = e.Inflictor["Transform"]["Position"];
     //if testing
-    if (m_Testing) {
+#ifdef INDICATOR_TEST
         inflictorPos = DamageIndicatorTest(e.Victim);
-    }
+#endif
 
     float angleBetweenVectors = CalculateAngle(e.Victim, inflictorPos);
 
@@ -100,6 +100,7 @@ float DamageIndicatorSystem::CalculateAngle(EntityWrapper player, glm::vec3 enem
 
     return angleBetweenVectors;
 }
+#ifdef INDICATOR_TEST
 glm::vec3 DamageIndicatorSystem::DamageIndicatorTest(EntityWrapper player) {
     auto currentPos = (glm::vec3)player["Transform"]["Position"];
 
@@ -145,3 +146,4 @@ glm::vec3 DamageIndicatorSystem::DamageIndicatorTest(EntityWrapper player) {
     deathEffectEW["Transform"]["Orientation"] = (glm::vec3)player["Transform"]["Orientation"];
     return inflictorPos;
 }
+#endif
\ No newline at end of file