[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.96.2.8,2.96.2.9
kirben
kirben at users.sourceforge.net
Thu Jan 26 17:30:18 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12939/scumm
Modified Files:
Tag: branch-0-8-0
wiz_he.cpp
Log Message:
Backport another bug fix for HE games.
Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.96.2.8
retrieving revision 2.96.2.9
diff -u -d -r2.96.2.8 -r2.96.2.9
--- wiz_he.cpp 27 Jan 2006 00:34:42 -0000 2.96.2.8
+++ wiz_he.cpp 27 Jan 2006 01:29:33 -0000 2.96.2.9
@@ -1934,7 +1934,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);
@@ -1964,7 +1968,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));
More information about the Scummvm-git-logs
mailing list