From 6a5c75a439ce2e909cd7088380ae9ca8d005b6c3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Wed, 28 Dec 2011 20:26:15 +0200
Subject: DREAMWEB: Changed hasSpeech() to also take account of the audio
 settings

This fixes an assert in the madman sequence
---
 engines/dreamweb/dreamweb.cpp | 2 +-
 engines/dreamweb/sound.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 661981c377..f942b84f76 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 8e125cc0e1..b79be28cea 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;
-- 
cgit v1.2.3