Promoted SpawnerSystem to Engine

include/Game/Events/ESpawnerSpawn.h

@@ -1,18 +0,0 @@
-#ifndef ESpawnerSpawn_h__
-#define ESpawnerSpawn_h__
-
-#include "Core/Event.h"
-#include "Core/EntityWrapper.h"
-
-namespace Events
-{
-
-struct SpawnerSpawn : Event
-{
-    EntityWrapper Spawner;
-    EntityWrapper Parent;
-};
-
-}
-
-#endif

include/Game/Systems/MainMenuSystem.h

@@ -5,7 +5,7 @@
 #include "Rendering/IRenderer.h"
 #include "Core/ResourceManager.h"
 #include "Core/Event.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 
 
 #include "GUI/EButtonClicked.h"

include/Game/Systems/PlayerSpawnSystem.h

@@ -1,7 +1,7 @@
 #include "Core/System.h"
 #include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
-#include "Events/ESpawnerSpawn.h"
+#include "Core/SpawnerSystem.h"
+#include "Core/ESpawnerSpawn.h"
 #include "Core/EPlayerSpawned.h"
 #include "Core/EPlayerDeath.h"
 #include "Rendering/ESetCamera.h"

include/Game/Systems/ServerListSystem.h

@@ -5,7 +5,7 @@
 #include "Rendering/IRenderer.h"
 #include "Core/ResourceManager.h"
 #include "Core/Event.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Core/EventBroker.h"
 
 #include "Network/ESearchForServers.h"

include/Game/Systems/SpawnerSystem.h

@@ -1,29 +0,0 @@
-#ifndef SpawnerSystem_h__
-#define SpawnerSystem_h__
-
-#include <random>
-#include "Common.h"
-#include "GLM.h"
-#include "Core/System.h"
-#include "Events/ESpawnerSpawn.h"
-#include "Core/Transform.h"
-#include "Core/EntityFile.h"
-
-class SpawnerSystem : public System
-{
-public:
-    SpawnerSystem(SystemParams params);
-
-    // If dontCollideComponent is set, to e.g. "Player", then all the spawner 
-    // will try to pick a spawn location so that the spawned entity doesn't 
-    // collide with anything that has that component and is collidable.
-    static EntityWrapper Spawn(EntityWrapper spawner, EntityWrapper parent = EntityWrapper::Invalid, const std::string& dontCollideComponent = "");
-
-private:
-    EventRelay<SpawnerSystem, Events::SpawnerSpawn> m_OnSpawnerSpawn;
-    bool OnSpawnerSpawn(Events::SpawnerSpawn& e);
-    static void transformEntityToSpawnPoint(EntityWrapper spawnedEntity, EntityWrapper spawnPoint);
-    static bool spawnedEntityIsColliding(EntityWrapper spawnedEntity, EntityWrapper spawnPoint, const std::string& dontCollideComponent);
-};
-
-#endif

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -6,7 +6,7 @@
 #include "Core/Octree.h"
 #include "Collision/EntityAABB.h"
 #include "Input/EInputCommand.h"
-#include "Systems/SpawnerSystem.h"
+#include "Core/SpawnerSystem.h"
 #include "Rendering/ESetCamera.h"
 #include "Core/ConfigFile.h"
 #include "Rendering/EAutoAnimationBlend.h"