BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
stiffly
2016-02-08 14:29:55 +01:00
parent 9da1419895
commit 14c5410524
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/SoundSystem.cpp
+13 -14
View File
@@ -24,8 +24,7 @@ void SoundSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComp
} }
void SoundSystem::Update(double dt) void SoundSystem::Update(double dt)
{ { }
}
bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e) bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
{ {
@@ -129,23 +128,23 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e) bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
{ {
if (e.PlayerID == m_LocalPlayer.ID) { //if (e.PlayerID == m_LocalPlayer.ID) {
Events::PlaySoundOnEntity ev; Events::PlaySoundOnEntity ev;
ev.EmitterID = createChildEmitter(m_LocalPlayer); ev.EmitterID = createChildEmitter(m_LocalPlayer);
ev.FilePath = "Audio/die/die2.wav"; // should random between a bunch ev.FilePath = "Audio/die/die2.wav"; // should random between a bunch
m_EventBroker->Publish(ev); m_EventBroker->Publish(ev);
} //}
return false; return false;
} }
bool SoundSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup & e) bool SoundSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup & e)
{ {
if (e.PlayerHealedID == m_LocalPlayer.ID) { //if (e.PlayerHealedID == m_LocalPlayer.ID) {
Events::PlaySoundOnEntity ev; Events::PlaySoundOnEntity ev;
ev.EmitterID = createChildEmitter(m_LocalPlayer); ev.EmitterID = createChildEmitter(m_LocalPlayer);
ev.FilePath = "Audio/pickup/pickup2.wav"; ev.FilePath = "Audio/pickup/pickup2.wav";
m_EventBroker->Publish(ev); m_EventBroker->Publish(ev);
} //}
return false; return false;
} }