[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.276,1.277

Travis Howell kirben at users.sourceforge.net
Sat Aug 2 03:16:01 CEST 2003


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

Modified Files:
	simon.cpp 
Log Message:

Add combined speech/subtitles support for simon2 hebrew


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- simon.cpp	2 Aug 2003 10:09:05 -0000	1.276
+++ simon.cpp	2 Aug 2003 10:15:07 -0000	1.277
@@ -4431,10 +4431,16 @@
 		_start_mainscript = true;
 
 	if (_game & GF_TALKIE) {
-		// Check for speech file in Simon the Sorcerer 2
 		if (_game & GF_SIMON2) {
-			if (_sound->hasVoice())
-				_subtitles = false;
+			// Allow choice in Hebrew version of Simon the Sorcerer 2
+			if (_language == 20) {
+				if (_noSubtitles)
+					_subtitles = false;
+			// Check for speech file in other versions of Simon the Sorcerer 2
+			} else {
+				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;





More information about the Scummvm-git-logs mailing list