[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.83,2.84 charset.h,2.23,2.24 scumm.h,1.351,1.352 scummvm.cpp,2.536,2.537

[Max Horn]

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

Modified Files:
	charset.cpp charset.h scumm.h scummvm.cpp 
Log Message:
cleanup

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.83
retrieving revision 2.84
diff -u -d -r2.83 -r2.84
--- charset.cpp	8 Jan 2004 03:24:41 -0000	2.83
+++ charset.cpp	8 Jan 2004 17:41:11 -0000	2.84
@@ -864,9 +864,10 @@
 };
 #endif
 
-void CharsetRendererV2::setCurID(byte id) {
+CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
+	: CharsetRendererV3(vm) {
 
-	switch (_vm->_language) {
+	switch (language) {
 	case Common::DE_DEU:
 		_fontPtr = germanCharsetDataV2;
 		break;

Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- charset.h	6 Jan 2004 12:45:30 -0000	2.23
+++ charset.h	8 Jan 2004 17:41:11 -0000	2.24
@@ -122,9 +122,9 @@
 	int getCharWidth(byte chr) { return 8; }
 
 public:
-	CharsetRendererV2(ScummEngine *vm) : CharsetRendererV3(vm) {}
+	CharsetRendererV2(ScummEngine *vm, Common::Language language);
 	
-	void setCurID(byte id);
+	void setCurID(byte id) {}
 };
 
 class CharsetRendererNut : public CharsetRenderer {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- scumm.h	8 Jan 2004 17:30:36 -0000	1.351
+++ scumm.h	8 Jan 2004 17:41:11 -0000	1.352
@@ -1038,7 +1038,7 @@
 	const byte *_messagePtr;
 	bool _keepText;
 public:
-	uint16 _language;
+	Common::Language _language;
 protected:
 	bool _existLanguageFile;
 	char *_languageBuffer;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.536
retrieving revision 2.537
diff -u -d -r2.536 -r2.537
--- scummvm.cpp	8 Jan 2004 17:30:36 -0000	2.536
+++ scummvm.cpp	8 Jan 2004 17:41:11 -0000	2.537
@@ -364,7 +364,6 @@
 	_bootParam = 0;
 	_dumpScripts = false;
 	_debugMode = 0;
-	_language = 0;
 	_objectOwnerTable = NULL;
 	_objectRoomTable = NULL;
 	_objectStateTable = NULL;
@@ -788,6 +787,8 @@
 				fontFile = "chinese.fnt";
 			}
 			break;
+		default:
+			break;
 		}
 		if (fontFile && fp.open(fontFile, getGameDataPath())) {
 			debug(2, "Loading CJK Font");
@@ -807,6 +808,8 @@
 			case Common::ZH_TWN:
 				numChar = 1; //FIXME
 				break;
+			default:
+				break;
 			}
 			_2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar];
 			fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar);
@@ -829,7 +832,7 @@
 
 	// Create the charset renderer
 	if (_version <= 2)
-		_charset = new CharsetRendererV2(this);
+		_charset = new CharsetRendererV2(this, _language);
 	else if (_version == 3)
 		_charset = new CharsetRendererV3(this);
 	else if (_version == 8)