[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.94,1.95

Robert G?ffringmann lavosspawn at users.sourceforge.net
Sat Jul 12 08:27:03 CEST 2003


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

Modified Files:
	sky.cpp 
Log Message:
try all languages, if selected one can't be found.

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- sky.cpp	12 Jul 2003 10:02:12 -0000	1.94
+++ sky.cpp	12 Jul 2003 15:26:07 -0000	1.95
@@ -177,7 +177,7 @@
 
 	bool introSkipped = false;
 	if (!_quickLaunch) {
-		if (_systemVars.gameVersion != 267) // don't do intro for floppydemo
+		if (_systemVars.gameVersion <= 267) // don't do intro for floppydemos
 			introSkipped = !intro();
 
 		_skyDisk->flushPrefetched();
@@ -270,8 +270,17 @@
 		_systemVars.language = _languageTable[_detector->_language];
 
 	if (!_skyDisk->fileExists(60600 + SkyState::_systemVars.language * 8)) {
-		warning("The language you selected does not exist in your BASS version.\nSwitching to english.");
-		SkyState::_systemVars.language = SKY_ENGLISH;
+		warning("The language you selected does not exist in your BASS version.");
+		if (_skyDisk->fileExists(60600))
+			SkyState::_systemVars.language = SKY_ENGLISH;
+		else if (_skyDisk->fileExists(60600 + SKY_USA * 8))
+			SkyState::_systemVars.language = SKY_USA;
+		else
+			for (uint8 cnt = SKY_ENGLISH; cnt <= SKY_SPANISH; cnt++)
+				if (_skyDisk->fileExists(60600 + cnt * 8)) {
+					SkyState::_systemVars.language = cnt;
+					break;
+				}
 	}
 
 	uint16 result = 0;





More information about the Scummvm-git-logs mailing list