Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

toggle of music in custom menu while waiting for players

Browse Source
This commit is contained in:
Titus Tscharntke 2010-09-03 23:15:42 +00:00
parent 89510fb656
commit f101d12da6
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/glest_game/menu/main_menu.cpp
View File

@ -193,7 +193,12 @@ MenuState::MenuState(Program *program, MainMenu *mainMenu, const string &stateNa
this->mainMenu= mainMenu;
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__);
//switch on menu music again, it might be muted
Config &config = Config::getInstance();
float configVolume = (config.getInt("SoundVolumeMusic") / 100.f);
CoreData::getInstance().getMenuMusic()->setVolume(configVolume);
//camera
XmlTree xmlTree;
xmlTree.load("data/core/menu/menu.xml");

28
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -410,6 +410,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
// write hint to console:
Config &configKeys = Config::getInstance(std::pair<ConfigType,ConfigType>(cfgMainKeys,cfgUserKeys));
console.addLine(lang.get("TO SWITCH OFF MUSIC PRESS")+" - \""+configKeys.getCharKey("ToggleMusic")+"\"");
//chatManager.init(&console, world.getThisTeamIndex());
chatManager.init(&console, -1,true);
@ -1330,6 +1335,10 @@ void MenuStateCustomGame::update() {
if(currentConnectionCount > soundConnectionCount){
soundConnectionCount = currentConnectionCount;
SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
//switch on music again!!
Config &config = Config::getInstance();
float configVolume = (config.getInt("SoundVolumeMusic") / 100.f);
CoreData::getInstance().getMenuMusic()->setVolume(configVolume);
}
soundConnectionCount = currentConnectionCount;
@ -2025,6 +2034,25 @@ void MenuStateCustomGame::keyDown(char key) {
if(key == configKeys.getCharKey("ShowFullConsole")) {
showFullConsole= true;
}
//Toggle music
else if(key == configKeys.getCharKey("ToggleMusic")) {
Config &config = Config::getInstance();
Lang &lang= Lang::getInstance();
float configVolume = (config.getInt("SoundVolumeMusic") / 100.f);
float currentVolume = CoreData::getInstance().getMenuMusic()->getVolume();
if(currentVolume > 0) {
CoreData::getInstance().getMenuMusic()->setVolume(0.f);
console.addLine(lang.get("GameMusic") + " " + lang.get("Off"));
}
else {
CoreData::getInstance().getMenuMusic()->setVolume(configVolume);
//If the config says zero, use the default music volume
//gameMusic->setVolume(configVolume ? configVolume : 0.9);
console.addLine(lang.get("GameMusic"));
}
}
}
}
}