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

Kraken power down sound. Added Zap sound to story

Browse Source
This commit is contained in:
Stiffly
2015-10-22 10:54:53 +02:00
parent bee4a05670
commit 16560a86b3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/Sounds/jap-huh.wav
BIN
View File
Binary file not shown.
assets/Sounds/jap-story.wav
BIN
View File
Binary file not shown.
src/game/Physics/PhysicsSystem.cpp
+1 -1
View File
@@ -860,7 +860,7 @@ bool dd::Systems::PhysicsSystem::OnContact(const dd::Events::Contact &event)
EventBroker->Publish(se); EventBroker->Publish(se);
e.SpriteFile = "Textures/PowerUps/InkBlaster.png"; e.SpriteFile = "Textures/PowerUps/InkBlaster.png";
} else if (PowerKraken) { } else if (PowerKraken) {
se.FilePath = "Sounds/jap-awesome.wav"; se.FilePath = "Sounds/jap-huh.wav";
EventBroker->Publish(se); EventBroker->Publish(se);
e.SpriteFile = "Textures/PowerUps/RealeaseTheKraken.png"; e.SpriteFile = "Textures/PowerUps/RealeaseTheKraken.png";
} }
src/game/Sound/SoundSystem.cpp
+7 -7
View File
@@ -6,12 +6,12 @@ dd::Systems::SoundSystem::~SoundSystem()
for (auto &bgm : m_BGMSourcesToBuffers) { for (auto &bgm : m_BGMSourcesToBuffers) {
alSourceStop(bgm.first); alSourceStop(bgm.first);
alDeleteSources(1, &bgm.first); alDeleteSources(1, &bgm.first);
//bgm.second->~Sound(); bgm.second->~Sound();
} }
for (auto &sfx : m_SFXSourcesToBuffers) { for (auto &sfx : m_SFXSourcesToBuffers) {
alSourceStop(sfx.first); alSourceStop(sfx.first);
alDeleteSources(1, &sfx.first); alDeleteSources(1, &sfx.first);
//sfx.second->~Sound(); sfx.second->~Sound();
} }
m_BGMSourcesToBuffers.clear(); m_BGMSourcesToBuffers.clear();
m_SFXSourcesToBuffers.clear(); m_SFXSourcesToBuffers.clear();
@@ -46,11 +46,11 @@ void dd::Systems::SoundSystem::Initialize()
m_BGMMasterVolume = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<float>("Audio.BGMVolume", 1.f); m_BGMMasterVolume = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<float>("Audio.BGMVolume", 1.f);
//TODO: Move this //TODO: Move this
Events::PlaySound e; // Events::PlaySound e;
e.FilePath = MENU_BGM; // e.FilePath = MENU_BGM;
e.IsAmbient = true; // e.IsAmbient = true;
e.Gain = 0.2f; // e.Gain = 0.2f;
EventBroker->Publish(e); // EventBroker->Publish(e);
} }
void dd::Systems::SoundSystem::Update(double dt) void dd::Systems::SoundSystem::Update(double dt)