diff --git a/assets/Sounds/jap-huh.wav b/assets/Sounds/jap-huh.wav new file mode 100644 index 0000000..2753a02 Binary files /dev/null and b/assets/Sounds/jap-huh.wav differ diff --git a/assets/Sounds/jap-story.wav b/assets/Sounds/jap-story.wav index 54fe420..00f4f7a 100644 Binary files a/assets/Sounds/jap-story.wav and b/assets/Sounds/jap-story.wav differ diff --git a/src/game/Physics/PhysicsSystem.cpp b/src/game/Physics/PhysicsSystem.cpp index 8ee030f..180e7c8 100755 --- a/src/game/Physics/PhysicsSystem.cpp +++ b/src/game/Physics/PhysicsSystem.cpp @@ -860,7 +860,7 @@ bool dd::Systems::PhysicsSystem::OnContact(const dd::Events::Contact &event) EventBroker->Publish(se); e.SpriteFile = "Textures/PowerUps/InkBlaster.png"; } else if (PowerKraken) { - se.FilePath = "Sounds/jap-awesome.wav"; + se.FilePath = "Sounds/jap-huh.wav"; EventBroker->Publish(se); e.SpriteFile = "Textures/PowerUps/RealeaseTheKraken.png"; } diff --git a/src/game/Sound/SoundSystem.cpp b/src/game/Sound/SoundSystem.cpp index 0d3d8e7..d8bd94d 100644 --- a/src/game/Sound/SoundSystem.cpp +++ b/src/game/Sound/SoundSystem.cpp @@ -6,12 +6,12 @@ dd::Systems::SoundSystem::~SoundSystem() for (auto &bgm : m_BGMSourcesToBuffers) { alSourceStop(bgm.first); alDeleteSources(1, &bgm.first); - //bgm.second->~Sound(); + bgm.second->~Sound(); } for (auto &sfx : m_SFXSourcesToBuffers) { alSourceStop(sfx.first); alDeleteSources(1, &sfx.first); - //sfx.second->~Sound(); + sfx.second->~Sound(); } m_BGMSourcesToBuffers.clear(); m_SFXSourcesToBuffers.clear(); @@ -46,11 +46,11 @@ void dd::Systems::SoundSystem::Initialize() m_BGMMasterVolume = ResourceManager::Load("Config.ini")->GetValue("Audio.BGMVolume", 1.f); //TODO: Move this - Events::PlaySound e; - e.FilePath = MENU_BGM; - e.IsAmbient = true; - e.Gain = 0.2f; - EventBroker->Publish(e); +// Events::PlaySound e; +// e.FilePath = MENU_BGM; +// e.IsAmbient = true; +// e.Gain = 0.2f; +// EventBroker->Publish(e); } void dd::Systems::SoundSystem::Update(double dt)