From c42e1e09672a172ca9877f815fcb0f448d88b72b Mon Sep 17 00:00:00 2001
From: stiffly <adambylehn@hotmail.com>
Date: Tue, 23 Feb 2016 11:07:41 +0100
Subject: [PATCH] SoundSystem Fix. Now subscribes to an event that was thought
 to be listened to.

---
 src/Game/Systems/SoundSystem.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/Game/Systems/SoundSystem.cpp b/src/Game/Systems/SoundSystem.cpp
index 56c1f018..b4a37ad0 100644
--- a/src/Game/Systems/SoundSystem.cpp
+++ b/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_EPlayerDeath, &SoundSystem::OnPlayerDeath);
     }
 }
 
@@ -111,7 +112,12 @@ bool SoundSystem::OnCaptured(const Events::Captured & e)
 // Testing purposes atm...
 bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
 {
-    // Should check for only local players here...
+    if (!IsClient) { // Only play for clients
+        return false;
+    }
+    if (LocalPlayer.ID = e.Victim.ID) { // You're local player was the one who took dmg
+        return false;
+    }
     std::uniform_int_distribution<int> dist(1, 12);
     int rand = dist(generator);
     std::vector<std::string> paths;
@@ -131,8 +137,16 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
 
 bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
 {
-    Events::PlaySoundOnEntity ev;
-    ev.EmitterID = LocalPlayer.ID;
+    if (e.Player.ID != LocalPlayer.ID) {
+        return false;
+    }
+    if (!IsClient) {
+        return false;
+    }
+    // The local player is dead. The local player might be invalid?
+    // Play the sound from the listener.
+    // TODO: We might want to hear other players die.
+    Events::PlayBackgroundMusic ev;
     ev.FilePath = "Audio/die/die2.wav";
     m_EventBroker->Publish(ev);
     return false;