[Scummvm-cvs-logs] CVS: scummvm/queen journal.cpp,1.25,1.26

[David Eriksson]

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

Modified Files:
	journal.cpp 
Log Message:
Never mind.


Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- journal.cpp	10 Jan 2004 16:48:51 -0000	1.25
+++ journal.cpp	10 Jan 2004 16:52:45 -0000	1.26
@@ -282,25 +282,10 @@
 		}
 		drawConfigPanel();
 	} else if (zoneNum == ZN_VOICE_TOGGLE) {
-
-		// 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);
-
+		_vm->sound()->toggleSpeech();
 		drawConfigPanel();
 	} else if (zoneNum == ZN_TEXT_TOGGLE) {
 		_vm->subtitles(!_vm->subtitles());
-
-		// Ensure voice is always on when text is off
-		if (!_vm->subtitles())
-			_vm->sound()->speechToggle(true);
-
 		drawConfigPanel();
 	}
 }