diff options
| author | Jamieson Christian | 2002-11-17 17:59:00 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2002-11-17 17:59:00 +0000 |
| commit | 5da9c10dab7e38427ea8464d295fe63076ca44bc (patch) | |
| tree | b8c0a1e04f0a06b96d9ec9052205f95ede7f0f6a /scumm/sound.cpp | |
| parent | 128580df1e7611d1d8a5955f2eb43ef8b58c5fa9 (diff) | |
| download | scummvm-rg350-5da9c10dab7e38427ea8464d295fe63076ca44bc.tar.gz scummvm-rg350-5da9c10dab7e38427ea8464d295fe63076ca44bc.tar.bz2 scummvm-rg350-5da9c10dab7e38427ea8464d295fe63076ca44bc.zip | |
Fixes to Master/SFX/Music volumes:
- All are in 0-255 range now. No 0-127 mismatches.
- Master volume now affects SFX and Music, consistent with LEC behavior.
- The [ and ] keys now affect Music volume, not Master. Consistent with LEC behavior.
Also changed [ and ] increment to 16, for 256/16 = 16 volume increments outside the GUI.
svn-id: r5592
Diffstat (limited to 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 0b3fc30db4..ebf18c2f67 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -700,7 +700,7 @@ void Sound::setupSound() { _scumm->_imuse->set_master_volume(_sound_volume_master); _scumm->_imuse->set_music_volume(_sound_volume_music); - _scumm->_mixer->setVolume(_sound_volume_sfx); + _scumm->_mixer->setVolume(_sound_volume_sfx * _sound_volume_master / 255); _scumm->_mixer->setMusicVolume(_sound_volume_music); } _sfxFile = openSfxFile(); |