[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.217,2.218 script_v5.cpp,1.197,1.198
Travis Howell
kirben at users.sourceforge.net
Sat Oct 4 19:59:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19947/scumm
Modified Files:
gfx.cpp script_v5.cpp
Log Message:
Use _roomPalette for 256 color 'SMALL_HEADER' games too, since it seems to help some.
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.217
retrieving revision 2.218
diff -u -d -r2.217 -r2.218
--- gfx.cpp 3 Oct 2003 18:33:54 -0000 2.217
+++ gfx.cpp 5 Oct 2003 02:58:11 -0000 2.218
@@ -1770,7 +1770,7 @@
int x = 8;
do {
FILL_BITS;
- *dst++ = color + _palette_mod;
+ *dst++ = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
againPos:
if (!READ_BIT) {
@@ -1819,7 +1819,7 @@
do {
FILL_BITS;
if (color != _transparentColor)
- *dst = color + _palette_mod;
+ *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
dst++;
againPos:
@@ -1870,7 +1870,7 @@
int x = 8;
do {
FILL_BITS;
- *dst++ = color + _palette_mod;
+ *dst++ = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
if (!READ_BIT) {
} else if (!READ_BIT) {
FILL_BITS;
@@ -1901,7 +1901,7 @@
do {
FILL_BITS;
if (color != _transparentColor)
- *dst = color + _palette_mod;
+ *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
dst++;
if (!READ_BIT) {
} else if (!READ_BIT) {
@@ -1933,7 +1933,7 @@
int h = height;
do {
FILL_BITS;
- *dst = color + _palette_mod;
+ *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
dst += _vm->_screenWidth;
if (!READ_BIT) {
} else if (!READ_BIT) {
@@ -1966,7 +1966,7 @@
do {
FILL_BITS;
if (color != _transparentColor)
- *dst = color + _palette_mod;
+ *dst = (_vm->_features & GF_SMALL_HEADER) ? _vm->_roomPalette[color + _palette_mod] : color + _palette_mod;
dst += _vm->_screenWidth;
if (!READ_BIT) {
} else if (!READ_BIT) {
@@ -2043,7 +2043,7 @@
byte color = *src++;
do {
- *dst = color;
+ *dst = _vm->_roomPalette[color];
NEXT_ROW;
} while (--run);
}
@@ -2072,7 +2072,7 @@
color += bits << i;
}
for (i = 0; i < ((c & 3) + 2); i++) {
- *dst = (run * 16 + color);
+ *dst = (run * 16 + _vm->_roomPalette[color]);
NEXT_ROW;
}
break;
@@ -2084,7 +2084,7 @@
READ_256BIT;
color += bits << j;
}
- *dst = (run * 16 + color);
+ *dst = (run * 16 + _vm->_roomPalette[color]);
NEXT_ROW;
}
break;
@@ -2113,13 +2113,13 @@
for (;;) {
byte color = *src++;
if (color < numcolors) {
- *dst = local_palette[color];
+ *dst = local_palette[_vm->_roomPalette[color]];
NEXT_ROW;
} else {
uint run = color - numcolors + 1;
color = *src++;
do {
- *dst = color;
+ *dst = _vm->_roomPalette[color];
NEXT_ROW;
} while (--run);
}
@@ -2136,7 +2136,7 @@
do {
int h = height;
do {
- *dst = color;
+ *dst = _vm->_roomPalette[color];
dst += _vm->_screenWidth;
for (i = 0; i < 3; i++) {
READ_256BIT;
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- script_v5.cpp 4 Oct 2003 11:50:21 -0000 1.197
+++ script_v5.cpp 5 Oct 2003 02:58:11 -0000 1.198
@@ -1834,13 +1834,8 @@
b = getVarOrDirectWord(0x40);
}
checkRange(256, 0, a, "o5_roomOps: 2: Illegal room color slot (%d)");
- if (_features & GF_16COLOR) {
- _roomPalette[b] = a;
- _fullRedraw = true;
- } else {
- _shadowPalette[b] = a;
- setDirtyColors(b, b);
- }
+ _roomPalette[b] = a;
+ _fullRedraw = true;
} else {
error("room-color is no longer a valid command");
}
More information about the Scummvm-git-logs
mailing list