Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.

src/Game/Systems/CapturePointSystem.cpp

@@ -1,8 +1,8 @@
 #include "Systems/CapturePointSystem.h"
 #include <algorithm>
 
-CapturePointSystem::CapturePointSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+CapturePointSystem::CapturePointSystem(SystemParams params) 
+    : System(params)
     , PureSystem("CapturePoint")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)

src/Game/Systems/HealthSystem.cpp

@@ -1,7 +1,7 @@
 #include "Systems/HealthSystem.h"
 
-HealthSystem::HealthSystem(World* m_World, EventBroker* eventBroker)
-    : System(m_World, eventBroker)
+HealthSystem::HealthSystem(SystemParams params)
+    : System(params)
     , PureSystem("Health")
 {
     //subscribe/listenTo playerdamage,healthpickup events (using the eventBroker)

src/Game/Systems/InterpolationSystem.cpp

@@ -1,7 +1,7 @@
 #include "Systems/InterpolationSystem.h"
 
-InterpolationSystem::InterpolationSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+InterpolationSystem::InterpolationSystem(SystemParams params) 
+    : System(params)
     , PureSystem("Transform")
 {
     ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");

src/Game/Systems/PlayerHUDSystem.cpp

@@ -1,21 +1,6 @@
-#include "Game/Systems/PlayerHUD.h"
+#include "Game/Systems/PlayerHUDSystem.h"
 
-PlayerHUD::PlayerHUD(World* world, EventBroker* eventBrokerer)
-    :System(world, eventBrokerer)
-    , m_World(world)
-    , m_EventBroker(eventBrokerer)
-{
-    
-    
-}
-
-PlayerHUD::~PlayerHUD()
-{
-    
-
-}
-
-void PlayerHUD::Update(double dt)
+void PlayerHUDSystem::Update(double dt)
 {
     auto healthHUDs = m_World->GetComponents("HealthHUD");
     if (healthHUDs == nullptr) {

src/Game/Systems/PlayerMovementSystem.cpp

@@ -1,7 +1,7 @@
 #include "Systems/PlayerMovementSystem.h"
 
-PlayerMovementSystem::PlayerMovementSystem(World* world, EventBroker* eventBroker)
-    : System(world, eventBroker)
+PlayerMovementSystem::PlayerMovementSystem(SystemParams params)
+    : System(params)
     , PureSystem("Player")
 {
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &PlayerMovementSystem::OnPlayerSpawned);

src/Game/Systems/PlayerSpawnSystem.cpp

@@ -1,7 +1,7 @@
 #include "Systems/PlayerSpawnSystem.h"
 
-PlayerSpawnSystem::PlayerSpawnSystem(World* m_World, EventBroker* eventBroker) 
-    : System(m_World, eventBroker)
+PlayerSpawnSystem::PlayerSpawnSystem(SystemParams params) 
+    : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_OnInputCommand, &PlayerSpawnSystem::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_OnPlayerSpawnerd, &PlayerSpawnSystem::OnPlayerSpawned);

src/Game/Systems/SpawnerSystem.cpp

@@ -1,7 +1,7 @@
 #include "Systems/SpawnerSystem.h"
 
-SpawnerSystem::SpawnerSystem(World* world, EventBroker* eventBroker) 
-    : System(world, eventBroker)
+SpawnerSystem::SpawnerSystem(SystemParams params) 
+    : System(params)
 {
     EVENT_SUBSCRIBE_MEMBER(m_OnSpawnerSpawn, &SpawnerSystem::OnSpawnerSpawn);
 }

src/Game/Systems/WeaponSystem.cpp

@@ -1,7 +1,7 @@
 #include "Systems/WeaponSystem.h"
 
-WeaponSystem::WeaponSystem(World* world, EventBroker* eventBroker, IRenderer* renderer)
-    : System(world, eventBroker)
+WeaponSystem::WeaponSystem(SystemParams params, IRenderer* renderer)
+    : System(params)
     , ImpureSystem()
     , m_Renderer(renderer)
 {