[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.475,2.476 scumm.cpp,1.485,1.486 scumm.h,1.616,1.617 string.cpp,1.286,1.287

[kirben]

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

Modified Files:
	intern.h scumm.cpp scumm.h string.cpp 
Log Message:

Move to HE80


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.475
retrieving revision 2.476
diff -u -d -r2.475 -r2.476
--- intern.h	1 May 2005 14:21:58 -0000	2.475
+++ intern.h	5 May 2005 13:16:48 -0000	2.476
@@ -952,6 +952,7 @@
 	byte VAR_POLYGONS_ONLY;
 	byte VAR_PLATFORM;
 	byte VAR_WINDOWS_VERSION;
+	byte VAR_CURRENT_CHARSET;
 	byte VAR_U32_VERSION;
 	byte VAR_WIZ_TCOLOR;
 };
@@ -978,6 +979,8 @@
 
 	virtual void initScummVars();
 
+	virtual void initCharset(int charset);
+
 	virtual void clearDrawQueues();
 
 	void loadImgSpot(int resId, int state, int16 &x, int16 &y);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -d -r1.485 -r1.486
--- scumm.cpp	5 May 2005 12:03:16 -0000	1.485
+++ scumm.cpp	5 May 2005 13:16:49 -0000	1.486
@@ -1054,7 +1054,6 @@
 	VAR_MUSIC_BUNDLE_LOADED = 0xFF;
 	VAR_VOICE_BUNDLE_LOADED = 0xFF;
 
-	VAR_CURRENT_CHARSET = 0xFF;
 	VAR_SKIP_RESET_TALK_ACTOR = 0xFF;
 	VAR_MUSIC_CHANNEL = 0xFF;
 	VAR_SOUND_CHANNEL = 0xFF;
@@ -1299,6 +1298,7 @@
 	VAR_POLYGONS_ONLY = 0xFF;
 	VAR_PLATFORM = 0xFF;
 	VAR_WINDOWS_VERSION = 0xFF;
+	VAR_CURRENT_CHARSET = 0xFF;
 	VAR_U32_VERSION = 0xFF;
 	VAR_WIZ_TCOLOR = 0xFF;
 }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.616
retrieving revision 1.617
diff -u -d -r1.616 -r1.617
--- scumm.h	1 May 2005 14:21:59 -0000	1.616
+++ scumm.h	5 May 2005 13:16:49 -0000	1.617
@@ -1131,7 +1131,7 @@
 
 	bool _keepText;
 
-	void initCharset(int charset);
+	virtual void initCharset(int charset);
 
 	void printString(int m, const byte *msg);
 
@@ -1296,7 +1296,6 @@
 	byte VAR_CLICK_AREA;
 
 	// HE specific variables
-	byte VAR_CURRENT_CHARSET;
 	byte VAR_SKIP_RESET_TALK_ACTOR;
 	byte VAR_MUSIC_CHANNEL;
 	byte VAR_SOUND_CHANNEL;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- string.cpp	1 May 2005 12:25:30 -0000	1.286
+++ string.cpp	5 May 2005 13:16:50 -0000	1.287
@@ -741,6 +741,11 @@
 	return 0;
 }
 
+void ScummEngine_v80he::initCharset(int charsetno) {
+	ScummEngine::initCharset(charsetno);
+	VAR(VAR_CURRENT_CHARSET) = charsetno;
+}
+
 void ScummEngine::initCharset(int charsetno) {
 	int i;
 
@@ -758,9 +763,6 @@
 	for (i = 0; i < 16; i++)
 		_charsetColorMap[i] = _charsetData[charsetno][i];
 
-	if (_heversion >= 80) {
-		VAR(VAR_CURRENT_CHARSET) = charsetno;
-	}
 }
 
 void ScummEngine_v6::enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center) {