[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.253,1.254

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv27990/simon

Modified Files:
	simon.cpp 
Log Message:

Check if voice file exists in simon2


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- simon.cpp	15 Jul 2003 16:40:24 -0000	1.253
+++ simon.cpp	15 Jul 2003 16:51:06 -0000	1.254
@@ -4380,9 +4380,10 @@
 		_start_mainscript = true;
 
 	if (_game & GF_TALKIE) {
-		// Always default to voice only on Simon the Sorcerer 2
+		// Check for speech file in Simon the Sorcerer 2
 		if (_game & GF_SIMON2) {
-			_subtitles = false;
+			if (_sound->hasVoice())
+				_subtitles = false;
 		// English and German versions of Simon the Sorcerer 1 don't have full subtitles
 		} else if (_language < 2) {
 			_subtitles = false;