[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.200,2.201 script_v2.cpp,2.186,2.187
Travis Howell
kirben at users.sourceforge.net
Tue Aug 26 08:57:12 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv11660/scumm
Modified Files:
gfx.cpp script_v2.cpp
Log Message:
Fix room colors in v1 zak
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.200
retrieving revision 2.201
diff -u -d -r2.200 -r2.201
--- gfx.cpp 25 Aug 2003 20:18:44 -0000 2.200
+++ gfx.cpp 26 Aug 2003 15:56:37 -0000 2.201
@@ -1346,6 +1346,11 @@
height >>= 3;
for (int y = 0; y < height; y++) {
_C64Colors[3] = (_C64ColorMap[y + stripnr * height] & 7);
+ if (_vm->_shadowPalette[0] == 255) {
+ _vm->_shadowPalette[0] = 0;
+ _C64Colors[2] = _vm->_shadowPalette[2];
+ _C64Colors[1] = _vm->_shadowPalette[1];
+ }
charIdx = _C64PicMap[y + stripnr * height] * 8;
for (int i = 0; i < 8; i++) {
byte c = _C64CharMap[charIdx + i];
@@ -3339,7 +3344,7 @@
for (i = _palDirtyMin; i <= _palDirtyMax; i++) {
byte *data;
- if (_features & GF_SMALL_HEADER)
+ if (_features & GF_SMALL_HEADER && _version > 1)
data = _currentPalette + _shadowPalette[i] * 3;
else
data = _currentPalette + i * 3;
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.186
retrieving revision 2.187
diff -u -d -r2.186 -r2.187
--- script_v2.cpp 25 Aug 2003 14:17:34 -0000 2.186
+++ script_v2.cpp 26 Aug 2003 15:56:37 -0000 2.187
@@ -1333,8 +1333,14 @@
VAR(VAR_CAMERA_MAX_X) = b;
break;
case 2: /* room color */
- _shadowPalette[b] = a;
- _fullRedraw = true;
+ if (_version == 1) {
+ _shadowPalette[0] = 255;
+ _shadowPalette[1] = a;
+ _shadowPalette[2] = b;
+ } else {
+ _shadowPalette[b] = a;
+ _fullRedraw = true;
+ }
break;
}
}
More information about the Scummvm-git-logs
mailing list