[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.120,1.121 sky.h,1.51,1.52

[Max Horn]

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

Modified Files:
	sky.cpp sky.h 
Log Message:
moved platform/language constants to common/util.*

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- sky.cpp	14 Oct 2003 07:52:34 -0000	1.120
+++ sky.cpp	17 Oct 2003 15:35:46 -0000	1.121
@@ -137,20 +137,6 @@
 	_skyScreen->showScreen(60110);
 }
 
-uint8 SkyEngine::_languageTable[11] = {
-	SKY_USA, // EN_USA
-	SKY_GERMAN, // DE_DEU
-	SKY_FRENCH, // FR_FRA
-	SKY_ITALIAN, // IT_ITA
-	SKY_PORTUGUESE, // PT_BRA
-	SKY_SPANISH, // ES_ESP
-	SKY_USA, // JA_JPN
-	SKY_USA, // ZH_TWN
-	SKY_USA, // KO_KOR
-	SKY_SWEDISH, // SE_SWE
-	SKY_ENGLISH  // EN_GRB
-};
-
 void SkyEngine::doCheat(uint8 num) {
 
 	switch(num) {
@@ -297,11 +283,32 @@
 	if (_systemVars.gameVersion == 288)
 		SkyCompact::patchFor288();
 
-	int language = GameDetector::parseLanguage(ConfMan.get("language"));
-	if (language < 0 || language > 10)
+	switch (Common::parseLanguage(ConfMan.get("language"))) {
+	case Common::DE_DEU:
+		_systemVars.language = SKY_GERMAN;
+		break;
+	case Common::FR_FRA:
+		_systemVars.language = SKY_FRENCH;
+		break;
+	case Common::IT_ITA:
+		_systemVars.language = SKY_ITALIAN;
+		break;
+	case Common::PT_BRA:
+		_systemVars.language = SKY_PORTUGUESE;
+		break;
+	case Common::ES_ESP:
+		_systemVars.language = SKY_SPANISH;
+		break;
+	case Common::SE_SWE:
+		_systemVars.language = SKY_SWEDISH;
+		break;
+	case Common::EN_GRB:
+		_systemVars.language = SKY_ENGLISH;
+		break;
+	default:
 		_systemVars.language = SKY_USA;
-	else
-		_systemVars.language = _languageTable[language];
+		break;
+	}
 
 	if (!_skyDisk->fileExists(60600 + SkyEngine::_systemVars.language * 8)) {
 		warning("The language you selected does not exist in your BASS version.");

Index: sky.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sky.h	5 Oct 2003 20:21:19 -0000	1.51
+++ sky.h	17 Oct 2003 15:35:46 -0000	1.52
@@ -53,7 +53,6 @@
 protected:
 	byte _game;
 	byte _key_pressed;
-	static uint8 _languageTable[11];
 	bool _quickLaunch; // set when starting with -x
 	bool _floppyIntro;