From c39a92933d4d66f7436bbaf3b152f906d24ccfd7 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 12 Mar 2005 00:47:17 +0000
Subject: Add key to toggle speech/subtitles

svn-id: r17082
---
 scumm/scumm.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'scumm/scumm.cpp')

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 508ff7878f..ff270a6760 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -829,6 +829,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 	_copyProtection = false;
 	_demoMode = false;
 	_confirmExit = false;
+	_voiceMode = 0;
 	_talkDelay = 0;
 	_keepText = false;
 	_existLanguageFile = false;
@@ -1024,6 +1025,17 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
 		if (!ConfMan.hasKey("subtitles"))
 			ConfMan.set("subtitles", !ConfMan.getBool("nosubtitles"));
 	}
+
+	// Make sure that at least subtitles are enabled
+	if (ConfMan.getBool("speech_mute") && !ConfMan.getBool("subtitles"))
+		ConfMan.set("subtitles", 1);
+
+	// TODO Detect subtitle only versions of scumm6 games
+	if (ConfMan.getBool("speech_mute"))
+		_voiceMode = 2;
+	else
+		_voiceMode = ConfMan.getBool("subtitles");
+
 	_confirmExit = ConfMan.getBool("confirm_exit");
 
 	if (ConfMan.hasKey("render_mode")) {
-- 
cgit v1.2.3