ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for bug #1087439 (Volume control regression)

Browse Source 
svn-id: r16113
This commit is contained in:
Max Horn
2004-12-18 11:07:52 +00:00
parent f344976a35
commit 6dfb2f2dfd
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scumm/scumm.cpp
+1 -7
View File
@@ -1090,8 +1090,6 @@ int ScummEngine::init(GameDetector &detector) {
if (_imuse) {
_imuse->setBase(res.address[rtSound]);
_imuse->setMusicVolume(ConfMan.getInt("music_volume"));
}
_sound->setupSound();
@@ -1376,12 +1374,8 @@ void ScummEngine::setupVolumes() {
int soundVolumeSfx = ConfMan.getInt("sfx_volume");
int soundVolumeSpeech = ConfMan.getInt("speech_volume");
if (_imuse) {
_imuse->setMusicVolume(soundVolumeMusic);
}
if (_musicEngine) {
_musicEngine->setMusicVolume(soundVolumeMusic);
_musicEngine->setMusicVolume(soundVolumeMusic * soundVolumeMaster / 255);
}
_mixer->setVolume(soundVolumeSfx * soundVolumeMaster / 255);