Moved some events to their correct place

include/Engine/Core/EAmmoPickup.h

@@ -1,18 +0,0 @@
-#ifndef EAmmoPickup_h__
-#define EAmmoPickup_h__
-
-#include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-    struct AmmoPickup : Event
-    {
-        EntityWrapper Player;
-        int AmmoGain;
-    };
-
-}
-
-#endif

include/Engine/Core/EPlayerHealthPickup.h

@@ -1,18 +0,0 @@
-#ifndef EPlayerHealthPickup_h__
-#define EPlayerHealthPickup_h__
-
-#include "EventBroker.h"
-#include "../Core/EntityWrapper.h"
-
-namespace Events
-{
-
-    struct PlayerHealthPickup : Event
-    {
-        EntityWrapper Player;
-        double HealthAmount;
-    };
-
-}
-
-#endif

include/Game/Events/EAmmoPickup.h

@@ -0,0 +1,18 @@
+#ifndef EAmmoPickup_h__
+#define EAmmoPickup_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct AmmoPickup : Event
+{
+    EntityWrapper Player;
+    int AmmoGain;
+};
+
+}
+
+#endif

include/Game/Events/ECaptured.h

@@ -1,14 +1,13 @@
 #ifndef ECaptured_h__
 #define ECaptured_h__
 
-#include "EventBroker.h"
-#include "../Core/Entity.h"
-#include "Engine/GLM.h"
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
 
 namespace Events
 {
 
-    //triggers when a capturePoint has been taken over
+//triggers when a capturePoint has been taken over
 struct Captured : Event
 {
     int TeamNumberThatCapturedCapturePoint;

include/Game/Events/EPlayerHealthPickup.h

@@ -0,0 +1,18 @@
+#ifndef EPlayerHealthPickup_h__
+#define EPlayerHealthPickup_h__
+
+#include "Core/EventBroker.h"
+#include "Core/EntityWrapper.h"
+
+namespace Events
+{
+
+struct PlayerHealthPickup : Event
+{
+    EntityWrapper Player;
+    double HealthAmount;
+};
+
+}
+
+#endif

include/Game/Events/EWin.h

@@ -1,14 +1,13 @@
 #ifndef EWin_h__
 #define EWin_h__
 
-#include "EventBroker.h"
-#include "../Core/Entity.h"
-#include "Engine/GLM.h"
+#include "Core/EventBroker.h"
+#include "Core/Entity.h"
 
 namespace Events
 {
 
-    //triggers when a team has captured all capturePoints
+//triggers when a team has captured all capturePoints
 struct Win : Event
 {
     //can be 0 = none, 1,2

include/Game/Systems/AmmoPickupSystem.h

@@ -5,8 +5,8 @@
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EAmmoPickup.h"
+#include "Events/EPickupSpawned.h"
+#include "Events/EAmmoPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
 

include/Game/Systems/CapturePointSystem.h

@@ -7,8 +7,8 @@
 #include "Common.h"
 #include "Core/System.h"
 #include "Engine/Collision/ETrigger.h"
-#include "Core/ECaptured.h"
-#include "Core/EWin.h"
+#include "Events/ECaptured.h"
+#include "Events/EWin.h"
 
 #include <tuple>
 #include <vector>

include/Game/Systems/HealthSystem.h

@@ -7,8 +7,8 @@
 #include "Common.h"
 #include "Core/System.h"
 #include "Core/EPlayerDamage.h"
-#include "Core/EPlayerHealthPickup.h"
 #include "Core/EPlayerDeath.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "Core/ConfigFile.h"
 #include "Input/EInputCommand.h"
 

include/Game/Systems/PickupSpawnSystem.h

@@ -5,8 +5,8 @@
 #include "Core/Transform.h"
 #include "Core/ResourceManager.h"
 #include "Core/EntityFileParser.h"
-#include "Core/EPickupSpawned.h"
-#include "Core/EPlayerHealthPickup.h"
+#include "Events/EPickupSpawned.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "Engine/Collision/ETrigger.h"
 #include "Common.h"
 #include <tuple>

include/Game/Systems/SoundSystem.h

@@ -13,10 +13,10 @@
 #include "../Engine/Core/EShoot.h"
 #include "../Engine/Core/EPlayerSpawned.h"
 #include "../Engine/Input/EInputCommand.h"
-#include "../Engine/Core/ECaptured.h"
+#include "Events/ECaptured.h"
 #include "../Engine/Core/EPlayerDamage.h"
 #include "../Engine/Core/EPlayerDeath.h"
-#include "../Engine/Core/EPlayerHealthPickup.h"
+#include "Events/EPlayerHealthPickup.h"
 #include "../Engine/Collision/ETrigger.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
 #include "../Engine/Sound/EPlayBackgroundMusic.h"

src/Game/Systems/SoundSystem.cpp

@@ -14,6 +14,7 @@ SoundSystem::SoundSystem(SystemParams params)
         EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
         EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
         EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &SoundSystem::OnTriggerTouch);
+        EVENT_SUBSCRIBE_MEMBER(m_EPlayerHealthPickup, &SoundSystem::OnPlayerHealthPickup);
     }
 }