[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.84,1.85

Jonathan Gray khalek at users.sourceforge.net
Thu Jul 10 03:37:13 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv22128

Modified Files:
	sky.cpp 
Log Message:
abide by command line request for no subtitles if running the cd version

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- sky.cpp	10 Jul 2003 08:24:16 -0000	1.84
+++ sky.cpp	10 Jul 2003 10:36:24 -0000	1.85
@@ -223,9 +223,12 @@
                         _system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
         }
 
-	if (isCDVersion())
-		_systemVars.systemFlags |= SF_ALLOW_SPEECH | SF_ALLOW_TEXT;
-	else
+	if (isCDVersion()) {
+		if (_detector->_noSubtitles)
+			_systemVars.systemFlags |= SF_ALLOW_SPEECH;
+		else
+			_systemVars.systemFlags |= SF_ALLOW_SPEECH | SF_ALLOW_TEXT;
+	} else
 		_systemVars.systemFlags |= SF_ALLOW_TEXT;
 
 	_systemVars.systemFlags |= SF_PLAY_VOCS;





More information about the Scummvm-git-logs mailing list