From 7deb32431ef28150429bcb90f7cdb0f2e54d7b31 Mon Sep 17 00:00:00 2001 From: verysecrethero Date: Thu, 21 Jan 2016 16:03:30 +0100 Subject: [PATCH] Removed Color TestCode in WeaponSystem --- include/Game/Systems/WeaponSystem.h | 1 - src/Game/Systems/WeaponSystem.cpp | 7 ------- 2 files changed, 8 deletions(-) diff --git a/include/Game/Systems/WeaponSystem.h b/include/Game/Systems/WeaponSystem.h index 36af4231..b85ba323 100644 --- a/include/Game/Systems/WeaponSystem.h +++ b/include/Game/Systems/WeaponSystem.h @@ -33,7 +33,6 @@ private: IRenderer* m_Renderer; std::vector> m_EShootVector; - double m_TestDamageTotal = 0.0; }; #endif \ No newline at end of file diff --git a/src/Game/Systems/WeaponSystem.cpp b/src/Game/Systems/WeaponSystem.cpp index ada48b54..6a701f6d 100644 --- a/src/Game/Systems/WeaponSystem.cpp +++ b/src/Game/Systems/WeaponSystem.cpp @@ -31,13 +31,6 @@ void WeaponSystem::Update(World* world, double dt) ePlayerDamage.PlayerDamagedID = somePickData.Entity; ePlayerDamage.TypeOfDamage = "Some Weapon"; m_EventBroker->Publish(ePlayerDamage); - //tests:color - m_TestDamageTotal += 0.25f; - if (m_TestDamageTotal > 6.0f) { - m_TestDamageTotal = 0.25f; - } - ComponentWrapper& playerModel = world->GetComponent(somePickData.Entity, "Model"); - playerModel["Color"] = glm::vec4(m_TestDamageTotal, 0, 0, 1); } m_EShootVector.erase(m_EShootVector.begin() + i - 1); }