[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.180,1.181

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4467

Modified Files:
	sky.cpp 
Log Message:
Use British English by default, as documented in the README file, not US
English. Since the game detector uses US English as its default language,
we also need to explicitly set the language when detecting the game. I find
that behaviour a bit unfortunate.


Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- sky.cpp	30 Jul 2005 21:11:40 -0000	1.180
+++ sky.cpp	9 Sep 2005 10:12:38 -0000	1.181
@@ -94,7 +94,9 @@
 
 			if (0 == scumm_stricmp("sky.dsk", fileName)) {
 				// Match found, add to list of candidates, then abort inner loop.
-				detectedGames.push_back(skySetting);
+				// The game detector uses US English by default. We want British
+				// English to match the recorded voices better.
+				detectedGames.push_back(DetectedGame(skySetting, Common::EN_GRB, Common::kPlatformUnknown));
 				break;
 			}
 		}
@@ -338,6 +340,9 @@
 	_skyLogic->useControlInstance(_skyControl);
 
 	switch (Common::parseLanguage(ConfMan.get("language"))) {
+	case Common::EN_USA:
+		_systemVars.language = SKY_USA;
+		break;
 	case Common::DE_DEU:
 		_systemVars.language = SKY_GERMAN;
 		break;
@@ -360,7 +365,7 @@
 		_systemVars.language = SKY_ENGLISH;
 		break;
 	default:
-		_systemVars.language = SKY_USA;
+		_systemVars.language = SKY_ENGLISH;
 		break;
 	}