[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.347,1.348
Travis Howell
kirben at users.sourceforge.net
Tue Dec 2 00:10:01 CET 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv10684/simon
Modified Files:
simon.cpp
Log Message:
Switch nosubtitles option to subtitles, to match others and help with Simon2 issue.
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -d -r1.347 -r1.348
--- simon.cpp 2 Dec 2003 06:23:05 -0000 1.347
+++ simon.cpp 2 Dec 2003 08:09:13 -0000 1.348
@@ -498,7 +498,7 @@
_debugMode = ConfMan.hasKey("debuglevel");
_debugLevel = ConfMan.getInt("debuglevel");
_language = Common::parseLanguage(ConfMan.get("language"));
- _noSubtitles = ConfMan.getBool("nosubtitles");
+ _subtitles = ConfMan.getBool("subtitles");
_system->init_size(320, 200);
@@ -4702,13 +4702,11 @@
if (_game & GF_TALKIE) {
_speech = true;
- if ((_game & GF_SIMON2) || _language >= 2) {
- if (_noSubtitles)
- _subtitles = false;
// English and German versions of Simon the Sorcerer 1 don't have full subtitles
- } else {
+ if (!(_game & GF_SIMON2) || _language < 2)
_subtitles = false;
- }
+ } else {
+ _subtitles = true;
}
if (_language == 4 || (_language > 5 && _language < 20))
More information about the Scummvm-git-logs
mailing list