merge fixes

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;
 

src/Engine/Rendering/DrawFinalPass.cpp

@@ -323,7 +323,6 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
     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<ExplosionEffectJob>(job);
         if (explosionEffectJob) {

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)