[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.233,1.234
Travis Howell
kirben at users.sourceforge.net
Thu Jun 5 06:48:10 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv22473/simon
Modified Files:
simon.cpp
Log Message:
Adjust default _subtitle values
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -d -r1.233 -r1.234
--- simon.cpp 5 Jun 2003 13:21:03 -0000 1.233
+++ simon.cpp 5 Jun 2003 13:47:07 -0000 1.234
@@ -4393,13 +4393,19 @@
if (_debugLevel == 4)
_start_mainscript = true;
- if (_game & GF_TALKIE)
- if (_noSubtitles)
+ if (_game & GF_TALKIE) {
+ // Always default to voice only on Simon the Sorcerer 2
+ if (_game & GF_SIMON2) {
_subtitles = false;
-
- // English and German versions of Simon the Sorcerer 1 don't have full subtitles
- if (!(_game & GF_SIMON2) && _language < 2)
- _subtitles = false;
+ // English and German versions of Simon the Sorcerer 1 don't have full subtitles
+ } else if (_language < 2) {
+ _subtitles = false;
+ // Allow choose in other versions of Simon the Sorcerer 1
+ } else {
+ if (_noSubtitles)
+ _subtitles = false;
+ }
+ }
if (_language == 4 || (_language > 5 && _language < 20))
error("The only known versions are English, French, German, Hebrew, Italian and Spanish");
More information about the Scummvm-git-logs
mailing list