mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 12:02:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop

Browse Source
This commit is contained in:
SoftCoder
2016-01-06 16:36:12 -08:00
parent 9496f485ce b36c6cd75c
commit 17678387c3
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/menu/menu_state_options_graphics.cpp
View File

@@ -944,18 +944,6 @@ void MenuStateOptionsGraphics::saveConfig(){
LuaScript::setDisableSandbox(true); LuaScript::setDisableSandbox(true);
} }
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
soundRenderer.stopAllSounds();
program->stopSoundSystem();
soundRenderer.init(program->getWindow());
soundRenderer.loadConfig();
soundRenderer.setMusicVolume(CoreData::getInstance().getMenuMusic());
program->startSoundSystem();
if(CoreData::getInstance().hasMainMenuVideoFilename() == false) {
soundRenderer.playMusic(CoreData::getInstance().getMenuMusic());
}
Renderer::getInstance().loadConfig(); Renderer::getInstance().loadConfig();
console.addLine(lang.getString("SettingsSaved")); console.addLine(lang.getString("SettingsSaved"));
} }

12
source/glest_game/menu/menu_state_options_network.cpp
View File

@@ -523,18 +523,6 @@ void MenuStateOptionsNetwork::saveConfig(){
config.save(); config.save();
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
soundRenderer.stopAllSounds();
program->stopSoundSystem();
soundRenderer.init(program->getWindow());
soundRenderer.loadConfig();
soundRenderer.setMusicVolume(CoreData::getInstance().getMenuMusic());
program->startSoundSystem();
if(CoreData::getInstance().hasMainMenuVideoFilename() == false) {
soundRenderer.playMusic(CoreData::getInstance().getMenuMusic());
}
Renderer::getInstance().loadConfig(); Renderer::getInstance().loadConfig();
console.addLine(lang.getString("SettingsSaved")); console.addLine(lang.getString("SettingsSaved"));
} }