diff options
| author | Arnaud Boutonné | 2010-12-22 22:56:42 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-12-22 22:56:42 +0000 |
| commit | 18d3e588258bc104c70621b76eb07fa5164fc46c (patch) | |
| tree | 0e1358c9c4e18b10b3a6b5a6e3e1568869839275 /engines | |
| parent | 6d30449d5aeaf21c810e31ee15776cf9a4522251 (diff) | |
| download | scummvm-rg350-18d3e588258bc104c70621b76eb07fa5164fc46c.tar.gz scummvm-rg350-18d3e588258bc104c70621b76eb07fa5164fc46c.tar.bz2 scummvm-rg350-18d3e588258bc104c70621b76eb07fa5164fc46c.zip | |
HUGO: Suppress some obsolete volume related variables
svn-id: r55019
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hugo/game.h | 11 | ||||
| -rw-r--r-- | engines/hugo/hugo.cpp | 6 | ||||
| -rw-r--r-- | engines/hugo/sound.cpp | 2 |
3 files changed, 6 insertions, 13 deletions
diff --git a/engines/hugo/game.h b/engines/hugo/game.h index 275f083d09..649ff63c23 100644 --- a/engines/hugo/game.h +++ b/engines/hugo/game.h @@ -777,9 +777,9 @@ struct object_t { /** * Following is structure of verbs and nouns for 'background' objects -* These are objects that appear in the various screens, but nothing -* interesting ever happens with them. Rather than just be dumb and say -* "don't understand" we produce an interesting msg to keep user sane. +* These are objects that appear in the various screens, but nothing +* interesting ever happens with them. Rather than just be dumb and say +* "don't understand" we produce an interesting msg to keep user sane. */ struct background_t { uint16 verbIndex; @@ -849,10 +849,7 @@ struct config_t { // User's config (saved) bool musicFl; // State of Music button/menu item bool soundFl; // State of Sound button/menu item bool turboFl; // State of Turbo button/menu item - bool backgroundMusicFl; // Continue music when task inactive - byte musicVolume; // Music volume percentage - byte soundVolume; // Sound volume percentage - bool playlist[MAX_TUNES]; // Tune playlist + bool playlist[MAX_TUNES]; // Tune playlist }; struct target_t { // Secondary target for action diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 02eca3ff68..1702c3752a 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -958,12 +958,8 @@ void HugoEngine::initConfig(inst_t action) { _config.musicFl = true; // Music state initially on _config.soundFl = true; // Sound state initially on _config.turboFl = false; // Turbo state initially off - _config.backgroundMusicFl = false; // No music when inactive - _config.musicVolume = 85; // Music volume % - _config.soundVolume = 100; // Sound volume % initPlaylist(_config.playlist); // Initialize default tune playlist - - _file->readBootFile(); // Read startup structure + _file->readBootFile(); // Read startup structure break; case RESET: // Find first tune and play it diff --git a/engines/hugo/sound.cpp b/engines/hugo/sound.cpp index 1894a636d8..cdb3ced347 100644 --- a/engines/hugo/sound.cpp +++ b/engines/hugo/sound.cpp @@ -240,7 +240,7 @@ SoundHandler::~SoundHandler() { * Set the FM music volume from config.mvolume (0..100%) */ void SoundHandler::setMusicVolume() { - _midiPlayer->setVolume(_config.musicVolume * 255 / 100); + _midiPlayer->syncVolume(); } /** |