[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.480,1.481 scumm.h,1.614,1.615 string.cpp,1.285,1.286 vars.cpp,1.130,1.131

[kirben]

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

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

HE80+ games store current charset numberin VAR80.
Fixes crash in bb2demo.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -d -r1.480 -r1.481
--- scumm.cpp	1 May 2005 07:16:47 -0000	1.480
+++ scumm.cpp	1 May 2005 12:25:29 -0000	1.481
@@ -1049,6 +1049,7 @@
 	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;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -d -r1.614 -r1.615
--- scumm.h	30 Apr 2005 22:01:15 -0000	1.614
+++ scumm.h	1 May 2005 12:25:29 -0000	1.615
@@ -1293,6 +1293,7 @@
 	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.285
retrieving revision 1.286
diff -u -d -r1.285 -r1.286
--- string.cpp	29 Apr 2005 01:10:49 -0000	1.285
+++ string.cpp	1 May 2005 12:25:30 -0000	1.286
@@ -757,6 +757,10 @@
 
 	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) {

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- vars.cpp	1 May 2005 07:16:48 -0000	1.130
+++ vars.cpp	1 May 2005 12:25:30 -0000	1.131
@@ -272,6 +272,7 @@
 	if (_heversion >= 80)
 		VAR_PLATFORM = 78;  // 1 is PC, 2 is Macintosh
  		VAR_WINDOWS_VERSION = 79; // 31 is Windows 3.1, 40 is Windows 95+
+		VAR_CURRENT_CHARSET = 80;
 		VAR_KEY_STATE = 86;
 		VAR_NUM_SOUND_CHANNELS = 88;
 	if (_heversion >= 90) {