[Scummvm-cvs-logs] CVS: scummvm/queen journal.cpp,1.22,1.23

[David Eriksson]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv7389

Modified Files:
	journal.cpp 
Log Message:
- Must have either subtitles or speech
- Should not be possible to disable text on non-CD-ROM versions


Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- journal.cpp	9 Jan 2004 13:36:37 -0000	1.22
+++ journal.cpp	10 Jan 2004 15:48:13 -0000	1.23
@@ -282,10 +282,25 @@
 		}
 		drawConfigPanel();
 	} else if (zoneNum == ZN_VOICE_TOGGLE) {
-		_vm->sound()->toggleSpeech();
+
+		// Only allow change to this setting on CD-ROM version
+		if (_vm->resource()->isCdRom())
+			_vm->sound()->toggleSpeech();
+		else
+			_vm->sound()->speechToggle(true);
+
+		// Ensure text is always on when voice is off
+		if (!_vm->sound()->speechOn())
+			_vm->subtitles(true);
+
 		drawConfigPanel();
 	} else if (zoneNum == ZN_TEXT_TOGGLE) {
 		_vm->subtitles(!_vm->subtitles());
+
+		// Ensure text is always on when voice is off
+		if (!_vm->subtitles())
+			_vm->sound()->speechToggle(true);
+
 		drawConfigPanel();
 	}
 }