From 9f657ada4ebd5ed1177b7ca078c5870c8df5f1a4 Mon Sep 17 00:00:00 2001 From: Tleety Date: Thu, 11 Feb 2016 14:52:52 +0100 Subject: [PATCH] merge fixes --- include/Game/Systems/CapturePointHUDSystem.h | 2 +- src/Engine/Rendering/DrawFinalPass.cpp | 1 - src/Game/Systems/CapturePointHUDSystem.cpp | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/Game/Systems/CapturePointHUDSystem.h b/include/Game/Systems/CapturePointHUDSystem.h index 102c52ce..94be3798 100644 --- a/include/Game/Systems/CapturePointHUDSystem.h +++ b/include/Game/Systems/CapturePointHUDSystem.h @@ -12,7 +12,7 @@ class CapturePointHUDSystem : public ImpureSystem { public: - CapturePointHUDSystem(World* world, EventBroker* eventBroker); + CapturePointHUDSystem(SystemParams params); virtual void Update(double dt) override; diff --git a/src/Engine/Rendering/DrawFinalPass.cpp b/src/Engine/Rendering/DrawFinalPass.cpp index 42cbd22b..362f2252 100644 --- a/src/Engine/Rendering/DrawFinalPass.cpp +++ b/src/Engine/Rendering/DrawFinalPass.cpp @@ -323,7 +323,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list>& glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, m_LightCullingPass->LightGridSSBO()); glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 4, m_LightCullingPass->LightIndexSSBO()); - for (auto &job : jobs) { auto explosionEffectJob = std::dynamic_pointer_cast(job); if (explosionEffectJob) { diff --git a/src/Game/Systems/CapturePointHUDSystem.cpp b/src/Game/Systems/CapturePointHUDSystem.cpp index ad8cc63a..c2d62c4b 100644 --- a/src/Game/Systems/CapturePointHUDSystem.cpp +++ b/src/Game/Systems/CapturePointHUDSystem.cpp @@ -1,7 +1,7 @@ #include "Systems/CapturePointHUDSystem.h" -CapturePointHUDSystem::CapturePointHUDSystem(World* world, EventBroker* eventBroker) - : System(world, eventBroker) +CapturePointHUDSystem::CapturePointHUDSystem(SystemParams params) + : System(params) , ImpureSystem() { //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)