[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.52,2.53 charset.h,2.18,2.19

[Max Horn]

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

Modified Files:
	charset.cpp charset.h 
Log Message:
correct shadow color in Zak256

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.52
retrieving revision 2.53
diff -u -d -r2.52 -r2.53
--- charset.cpp	26 Jun 2003 14:04:08 -0000	2.52
+++ charset.cpp	26 Jun 2003 21:41:53 -0000	2.53
@@ -927,6 +927,7 @@
 void CharsetRendererV3::setColor(byte color)
 {
 	_color = color;
+	_shadowColor = (_vm->_gameId == GID_ZAK256) ? 8 : 0;
 	if (_vm->_gameId == GID_ZAK256) {
 		_dropShadow = ((_color & 0x80) != 0);
 		_color &= 0x7f;
@@ -953,8 +954,6 @@
 	if (chr == '@')
 		return;
 
-	_vm->_charsetColorMap[1] = _color;
-
 	if (_firstChar) {
 		_str.left = _left;
 		_str.top = _top;
@@ -1186,11 +1185,11 @@
 				bits = *src++;
 			if ((bits & revBitMask[x % 8]) && y + drawTop >= 0) {
 				if (_dropShadow) {
-					*(dst + 1) = 0;
-					*(dst + _vm->_screenWidth) = 0;
-					*(dst + _vm->_screenWidth + 1) = 0;
+					*(dst + 1) = _shadowColor;
+					*(dst + _vm->_screenWidth) = _shadowColor;
+					*(dst + _vm->_screenWidth + 1) = _shadowColor;
 				}					
-				*dst = _vm->_charsetColorMap[1];
+				*dst = _color;
 				if (useMask) {
 					mask[maskpos] |= maskmask;
 					if (_dropShadow) {

Index: charset.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.h,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- charset.h	4 Jun 2003 14:37:42 -0000	2.18
+++ charset.h	26 Jun 2003 21:41:53 -0000	2.19
@@ -39,6 +39,7 @@
 
 protected:
 	byte _color;
+	byte _shadowColor;
 	bool _dropShadow;
 
 public: