[Scummvm-git-logs] scummvm master -> ad363ae89417308ac377b9460ff6f8fecb6fd8ee

[yuv422]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ad363ae894 DRAGONS: Clip sound volumes to 0 - 255 range


Commit: ad363ae89417308ac377b9460ff6f8fecb6fd8ee
    https://github.com/scummvm/scummvm/commit/ad363ae89417308ac377b9460ff6f8fecb6fd8ee
Author: Eric Fry (yuv422 at users.noreply.github.com)
Date: 2020-08-29T00:09:42+10:00

Commit Message:
DRAGONS: Clip sound volumes to 0 - 255 range

Changed paths:
    engines/dragons/sound.cpp


diff --git a/engines/dragons/sound.cpp b/engines/dragons/sound.cpp
index d8fa99af34..ffa14f042f 100644
--- a/engines/dragons/sound.cpp
+++ b/engines/dragons/sound.cpp
@@ -267,6 +267,9 @@ Audio::QueuingAudioStream *SoundManager::PSXAudioTrack::createNewAudioStream(Com
 
 SoundManager::SoundManager(DragonsEngine *vm, BigfileArchive *bigFileArchive, DragonRMS *dragonRMS)
 		: _vm(vm),
+		  _sfxVolume(0),
+		  _musicVolume(0),
+		  _speechVolume(0),
 		  _bigFileArchive(bigFileArchive),
 		  _dragonRMS(dragonRMS) {
 	_dat_8006bb60_sound_related = 0;
@@ -276,9 +279,6 @@ SoundManager::SoundManager(DragonsEngine *vm, BigfileArchive *bigFileArchive, Dr
 	if (ConfMan.hasKey("mute")) {
 		allSoundIsMuted = ConfMan.getBool("mute");
 	}
-	_speechVolume = ConfMan.getInt("speech_volume");
-	_sfxVolume = ConfMan.getInt("sfx_volume");
-	_musicVolume = ConfMan.getInt("music_volume");
 
 	if (ConfMan.hasKey("speech_mute") && !allSoundIsMuted) {
 		_vm->_mixer->muteSoundType(_vm->_mixer->kSpeechSoundType, ConfMan.getBool("speech_mute"));
@@ -295,7 +295,8 @@ SoundManager::SoundManager(DragonsEngine *vm, BigfileArchive *bigFileArchive, Dr
 	SomeInitSound_FUN_8003f64c();
 	initVabData();
 	_midiPlayer = new MidiMusicPlayer(_bigFileArchive, _vabMusx);
-	_midiPlayer->setVolume(_musicVolume);
+
+	syncSoundSettings();
 }
 
 SoundManager::~SoundManager() {