[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.102,2.103

[kirben]

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

Modified Files:
	wiz_he.cpp 
Log Message:

Values should only be set in HE99+.
Remove fixme, that difference in normal for ScummVM.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.102
retrieving revision 2.103
diff -u -d -r2.102 -r2.103
--- wiz_he.cpp	1 Nov 2005 00:52:25 -0000	2.102
+++ wiz_he.cpp	4 Nov 2005 01:12:20 -0000	2.103
@@ -1003,7 +1003,7 @@
 	int32 cw, ch;
 	if (flags & kWIFBlitToMemBuffer) {
 		dst = (uint8 *)malloc(width * height);
-		int color = 255; // FIXME: should be (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5;
+		int color = 255;
 		memset(dst, color, width * height);
 		cw = width;
 		ch = height;
@@ -1925,7 +1925,11 @@
 		}
 		switch (c) {
 		case 0:
-			ret = getRawWizPixelColor(wizd, x, y, w, h, _vm->VAR(_vm->VAR_WIZ_TCOLOR)) != _vm->VAR(_vm->VAR_WIZ_TCOLOR) ? 1 : 0;
+			if (_vm->_heversion >= 99) {
+				ret = getRawWizPixelColor(wizd, x, y, w, h, _vm->VAR(_vm->VAR_WIZ_TCOLOR)) != _vm->VAR(_vm->VAR_WIZ_TCOLOR) ? 1 : 0;
+			} else {
+				ret = 0;
+			}
 			break;
 		case 1:
 			ret = isWizPixelNonTransparent(wizd, x, y, w, h);
@@ -1955,7 +1959,11 @@
 	assert(wizd);
 	switch (c) {
 	case 0:
-		color = getRawWizPixelColor(wizd, x, y, w, h, _vm->VAR(_vm->VAR_WIZ_TCOLOR));
+		if (_vm->_heversion >= 99) {
+			color = getRawWizPixelColor(wizd, x, y, w, h, _vm->VAR(_vm->VAR_WIZ_TCOLOR));
+		} else {
+			color = _vm->VAR(_vm->VAR_WIZ_TCOLOR);
+		}
 		break;
 	case 1:
 		color = getWizPixelColor(wizd, x, y, w, h, _vm->VAR(_vm->VAR_WIZ_TCOLOR));