diff options
| author | Christopher Page | 2008-07-14 22:10:04 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-07-14 22:10:04 +0000 |
| commit | ebd3510b72aeff0021c2676ddfb08f12c3697b11 (patch) | |
| tree | d47345649bafde7810f38c52ff3f8f1948dc06c8 /engines/agos/agos.cpp | |
| parent | d2e8d4831e33f9e1c63d53c9dd615a15f67ab995 (diff) | |
| download | scummvm-rg350-ebd3510b72aeff0021c2676ddfb08f12c3697b11.tar.gz scummvm-rg350-ebd3510b72aeff0021c2676ddfb08f12c3697b11.tar.bz2 scummvm-rg350-ebd3510b72aeff0021c2676ddfb08f12c3697b11.zip | |
AGOS: Got rid of _masterVolume and replaced with _musicVolume and _sfxVolume so that music and sfx are separately controlled via the Options menu
svn-id: r33065
Diffstat (limited to 'engines/agos/agos.cpp')
| -rw-r--r-- | engines/agos/agos.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index a6e559726a..f6f597649f 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -572,7 +572,7 @@ int AGOSEngine::init() { if (ret) warning("MIDI Player init failed: \"%s\"", _midi.getErrorName (ret)); - _midi.setVolume(ConfMan.getInt("music_volume")); + _midi.setVolume(ConfMan.getInt("music_volume"), ConfMan.getInt("sfx_volume")); _midiEnabled = true; @@ -1083,7 +1083,8 @@ uint32 AGOSEngine::getTime() const { void AGOSEngine::syncSoundSettings() { _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); - _midi.setVolume(ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); + _midi.setVolume(ConfMan.getInt("music_volume"), ConfMan.getInt("sfx_volume")); } } // End of namespace AGOS |