[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.377,1.378

Travis Howell kirben at users.sourceforge.net
Thu Dec 18 03:17:00 CET 2003


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

Modified Files:
	simon.cpp 
Log Message:

Safetly check


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- simon.cpp	18 Dec 2003 11:04:02 -0000	1.377
+++ simon.cpp	18 Dec 2003 11:16:10 -0000	1.378
@@ -543,10 +543,13 @@
 	_debugLevel = ConfMan.getInt("debuglevel");
 	_language = Common::parseLanguage(ConfMan.get("language"));
 
+	if ((_game & GF_SIMON2) && ConfMan.hasKey("speech") && ConfMan.getBool("speech") == 0)
+		_speech = 0;
+
 	if (!(_game & GF_SIMON2) && _language > 1) {
 		if (ConfMan.hasKey("subtitles") && ConfMan.getBool("subtitles") == 0)
 			_subtitles = 0;
-	} else
+	} else if (_speech)
 		_subtitles = ConfMan.getBool("subtitles");
 
 	if (ConfMan.hasKey("fade") && ConfMan.getBool("fade") == 0)
@@ -554,8 +557,6 @@
 	if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
 		_speed = ConfMan.getInt("slow_down");
 
-	if ((_game & GF_SIMON2) && ConfMan.hasKey("speech") && ConfMan.getBool("speech") == 0)
-		_speech = 0;
 
 	_system->init_size(320, 200);
 





More information about the Scummvm-git-logs mailing list