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/input.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/input.cpp')
-rw-r--r-- | engines/agos/input.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 4d1b1b17cb..3ee81e1375 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -563,14 +563,14 @@ bool AGOSEngine::processSpecialKeys() { case Common::KEYCODE_PLUS: case Common::KEYCODE_KP_PLUS: if (_midiEnabled) { - _midi.setVolume(_midi.getVolume() + 16); + _midi.setVolume(_midi.getMusicVolume() + 16, _midi.getSFXVolume() + 16); } _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) + 16); break; case Common::KEYCODE_MINUS: case Common::KEYCODE_KP_MINUS: if (_midiEnabled) { - _midi.setVolume(_midi.getVolume() - 16); + _midi.setVolume(_midi.getMusicVolume() - 16, _midi.getSFXVolume() - 16); } _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) - 16); break; |