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/scumm/scumm.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/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 37e1fa862a..cc7e01fca7 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1673,7 +1673,6 @@ void ScummEngine::syncSoundSettings() { _musicEngine->setMusicVolume(soundVolumeMusic); } - _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, soundVolumeMusic); _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSfx); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech); |