[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.67,2.68 scummvm.cpp,2.451,2.452

[Max Horn]

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

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

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -d -r2.67 -r2.68
--- charset.cpp	9 Oct 2003 14:17:06 -0000	2.67
+++ charset.cpp	17 Oct 2003 15:35:45 -0000	2.68
@@ -22,7 +22,6 @@
 #include "scumm/charset.h"
 #include "scumm/scumm.h"
 #include "scumm/nut_renderer.h"
-#include "base/gameDetector.h"
 
 namespace Scumm {
 
@@ -868,16 +867,16 @@
 void CharsetRendererV2::setCurID(byte id) {
 
 	switch (_vm->_language) {
-	case DE_DEU:
+	case Common::DE_DEU:
 		_fontPtr = germanCharsetDataV2;
 		break;
-	case FR_FRA:
+	case Common::FR_FRA:
 		_fontPtr = frenchCharsetDataV2;
 		break;
-	case IT_ITA:
+	case Common::IT_ITA:
 		_fontPtr = italianCharsetDataV2;
 		break;
-	case ES_ESP:
+	case Common::ES_ESP:
 		_fontPtr = spanishCharsetDataV2;
 		break;
 	default:

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.451
retrieving revision 2.452
diff -u -d -r2.451 -r2.452
--- scummvm.cpp	17 Oct 2003 08:26:01 -0000	2.451
+++ scummvm.cpp	17 Oct 2003 15:35:45 -0000	2.452
@@ -609,7 +609,9 @@
 	_confirmExit = ConfMan.getBool("confirm_exit");
 	_defaultTalkDelay = ConfMan.getInt("talkspeed");
 	_native_mt32 = ConfMan.getBool("native_mt32");
-	_language = GameDetector::parseLanguage(ConfMan.get("language"));
+	// TODO: We shouldn't rely on the global Language values matching those COMI etc. expect.
+	// Rather we should explicitly translate them.
+	_language = Common::parseLanguage(ConfMan.get("language"));
 	memset(&res, 0, sizeof(res));
 	_hexdumpScripts = false;
 	_showStack = false;
@@ -707,19 +709,19 @@
 
 	// Load CJK font
 	_CJKMode = false;
-	if ((_gameId == GID_DIG || _gameId == GID_CMI) && (_language == KO_KOR || _language == JA_JPN || _language == ZH_TWN)) {
+	if ((_gameId == GID_DIG || _gameId == GID_CMI) && (_language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN)) {
 		File fp;
 		const char *fontFile = NULL;
 		switch(_language) {
-		case KO_KOR:
+		case Common::KO_KOR:
 			_CJKMode = true;
 			fontFile = "korean.fnt";
 			break;
-		case JA_JPN:
+		case Common::JA_JPN:
 			_CJKMode = true;
 			fontFile = (_gameId == GID_DIG) ? "kanji16.fnt" : "japanese.fnt";
 			break;
-		case ZH_TWN:
+		case Common::ZH_TWN:
 			if (_gameId == GID_CMI) {
 				_CJKMode = true;
 				fontFile = "chinese.fnt";
@@ -734,13 +736,13 @@
 
 			int numChar = 0;
 			switch(_language) {
-			case KO_KOR:
+			case Common::KO_KOR:
 				numChar = 2350;
 				break;
-			case JA_JPN:
+			case Common::JA_JPN:
 				numChar = (_gameId == GID_DIG) ? 1 : 1; //FIXME
 				break;
-			case ZH_TWN:
+			case Common::ZH_TWN:
 				numChar = 1; //FIXME
 				break;
 			}
@@ -2640,7 +2642,7 @@
 			detector->_game.features |= GF_AMIGA;
 	}
 
-	switch (GameDetector::parsePlatform(ConfMan.get("platform"))) {
+	switch (Common::parsePlatform(ConfMan.get("platform"))) {
 	case kPlatformAmiga:
 		detector->_game.features |= GF_AMIGA;
 		break;