[Scummvm-cvs-logs] scummvm master -> 948c97f31bf9d5c6b80b35739964ec5edcbb3102

dhewg dhewg at wiibrew.org
Sun Mar 20 12:05:33 CET 2011


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

Summary:
aee359811d QUEEN: Reenable speech per default
948c97f31b QUEEN: Fix the journal's music volume slider


Commit: aee359811d694ea106ba99b63c83687625a276c9
    https://github.com/scummvm/scummvm/commit/aee359811d694ea106ba99b63c83687625a276c9
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-20T03:53:57-07:00

Commit Message:
QUEEN: Reenable speech per default

Regression (typo) from b5af1568

Changed paths:
    engines/queen/queen.cpp



diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index a369219..692e381 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -253,7 +253,7 @@ void QueenEngine::readOptionSettings() {
 	_sound->setVolume(ConfMan.getInt("music_volume"));
 	_sound->musicToggle(!(mute || ConfMan.getBool("music_mute")));
 	_sound->sfxToggle(!(mute || ConfMan.getBool("sfx_mute")));
-	_sound->speechToggle(!(mute || !ConfMan.getBool("speech_mute")));
+	_sound->speechToggle(!(mute || ConfMan.getBool("speech_mute")));
 	_talkSpeed = (ConfMan.getInt("talkspeed") * (MAX_TEXT_SPEED - MIN_TEXT_SPEED) + 255 / 2) / 255 + MIN_TEXT_SPEED;
 	_subtitles = ConfMan.getBool("subtitles");
 	checkOptionSettings();


Commit: 948c97f31bf9d5c6b80b35739964ec5edcbb3102
    https://github.com/scummvm/scummvm/commit/948c97f31bf9d5c6b80b35739964ec5edcbb3102
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-20T04:01:27-07:00

Commit Message:
QUEEN: Fix the journal's music volume slider

Another regression from b5af1568

Changed paths:
    engines/queen/sound.cpp



diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp
index 6a9254d..a34af99 100644
--- a/engines/queen/sound.cpp
+++ b/engines/queen/sound.cpp
@@ -192,7 +192,12 @@ Sound *Sound::makeSoundInstance(Audio::Mixer *mixer, QueenEngine *vm, uint8 comp
 }
 
 void Sound::setVolume(int vol) {
-	_musicVolume = vol;
+	if (ConfMan.hasKey("mute") && ConfMan.getBool("mute"))
+		_musicVolume = 0;
+	else
+		_musicVolume = vol;
+
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _musicVolume);
 }
 
 void Sound::saveState(byte *&ptr) {






More information about the Scummvm-git-logs mailing list