From 956178350ffdd72cdb74338c97e9e2db0ebc75b5 Mon Sep 17 00:00:00 2001 From: auria Date: Thu, 16 Apr 2009 01:42:57 +0000 Subject: [PATCH] fixed music volume gauge... actually the bug was mine *blush*, discard the explaination i gave in previous commit git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3393 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/audio/sound_manager.hpp | 2 +- src/gui/state_manager.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp index f31e779ea..bd0c1020c 100644 --- a/src/audio/sound_manager.hpp +++ b/src/audio/sound_manager.hpp @@ -65,7 +65,7 @@ public: m_current_music->switchToFastMusic();} void setMasterMusicVolume(float gain); - int getMasterMusicVolume() const { return m_masterGain; } + float getMasterMusicVolume() const { return m_masterGain; } MusicInformation *getCurrentMusic() {return m_current_music; } MusicInformation *getMusicInformation(const std::string& filename); diff --git a/src/gui/state_manager.cpp b/src/gui/state_manager.cpp index 7c64accc2..6dfd9c907 100644 --- a/src/gui/state_manager.cpp +++ b/src/gui/state_manager.cpp @@ -265,6 +265,7 @@ namespace StateManager */ void menuEventOptions(GUIEngine::Widget* widget, std::string& name) { + // -- init if(name == "init") { const std::string& screen_name = GUIEngine::getCurrentScreen()->getName(); @@ -278,17 +279,18 @@ namespace StateManager else if(screen_name == "options_input.stkgui") ribbon->select( "controls" ); } + // audio-video sub-screen if(screen_name == "options_av.stkgui") { GUIEngine::GaugeWidget* gauge = dynamic_cast - (GUIEngine::getCurrentScreen()->getWidget("sfx_volume")); + (GUIEngine::getCurrentScreen()->getWidget("sfx_volume")); assert(gauge != NULL); gauge->setValue( sfx_manager->getMasterSFXVolume() ); gauge = dynamic_cast - (GUIEngine::getCurrentScreen()->getWidget("music_volume")); + (GUIEngine::getCurrentScreen()->getWidget("music_volume")); assert(gauge != NULL); gauge->setValue( sound_manager->getMasterMusicVolume() ); }