[Scummvm-cvs-logs] scummvm master -> 6a5c75a439ce2e909cd7088380ae9ca8d005b6c3

[bluegr]

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:
6a5c75a439 DREAMWEB: Changed hasSpeech() to also take account of the audio settings


Commit: 6a5c75a439ce2e909cd7088380ae9ca8d005b6c3
    https://github.com/scummvm/scummvm/commit/6a5c75a439ce2e909cd7088380ae9ca8d005b6c3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-28T10:26:15-08:00

Commit Message:
DREAMWEB: Changed hasSpeech() to also take account of the audio settings

This fixes an assert in the madman sequence

Changed paths:
    engines/dreamweb/dreamweb.cpp
    engines/dreamweb/sound.cpp



diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 661981c..f942b84 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -369,7 +369,7 @@ Common::Error DreamWebEngine::run() {
 	_console = new DreamWebConsole(this);
 
 	ConfMan.registerDefault("dreamweb_originalsaveload", "false");
-	_hasSpeech = Common::File::exists("speech/r01c0000.raw");
+	_hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute");
 
 	_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
 	dreamweb();
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index 8e125cc..b79be28 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -173,7 +173,7 @@ void DreamWebEngine::stopSound(uint8 channel) {
 }
 
 bool DreamWebEngine::loadSpeech(const Common::String &filename) {
-	if (ConfMan.getBool("speech_mute"))
+	if (!hasSpeech())
 		return false;
 
 	Common::File file;