Merge remote-tracking branch 'origin/master' into Sound

Conflicts: src/game/Sound/SoundSystem.cpp
2015-10-16 11:53:38 +02:00
parent 64f903a6b6 f335955396
commit 0180b29544
31 changed files with 1460 additions and 57 deletions
@@ -40,6 +40,9 @@ void dd::Systems::SoundSystem::Initialize()
    EVENT_SUBSCRIBE_MEMBER(m_EStopSound, &SoundSystem::OnStopSound);
    EVENT_SUBSCRIBE_MEMBER(m_EMasterVolume, &SoundSystem::OnMasterVolume);

+	m_SFXMasterVolume = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<float>("Audio.SFXVolume", 1.f);
+	m_BGMMasterVolume = ResourceManager::Load<ConfigFile>("Config.ini")->GetValue<float>("Audio.BGMVolume", 1.f);
+
 //     //Todo: Move this
 //     {
 //         dd::Events::PlaySound e;