[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.408,2.409 palette.cpp,2.27,2.28 script_v2.cpp,2.261,2.262
Eugene Sandulenko
sev at users.sourceforge.net
Sun Mar 20 17:16:46 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18674
Modified Files:
gfx.cpp palette.cpp script_v2.cpp
Log Message:
NES palette fixes from Quietust.
Some fixes of gray background for NES. Though maybe proper approach
would be to add global vars instead of checking every time.
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.408
retrieving revision 2.409
diff -u -d -r2.408 -r2.409
--- gfx.cpp 21 Mar 2005 00:27:38 -0000 2.408
+++ gfx.cpp 21 Mar 2005 01:15:28 -0000 2.409
@@ -878,12 +878,16 @@
}
} else {
// Clear area
- memset(screenBuf, 0, vs->h * vs->pitch);
+ if (_vm->_features & GF_NES)
+ memset(screenBuf, 0x1d, vs->h * vs->pitch);
+ else
+ memset(screenBuf, 0, vs->h * vs->pitch);
}
if (vs->hasTwoBuffers) {
// Clean out the charset mask
- memset(_vm->gdi._textSurface.pixels, CHARSET_MASK_TRANSPARENCY, _vm->gdi._textSurface.pitch * _vm->gdi._textSurface.h);
+ memset(_vm->gdi._textSurface.pixels, (_vm->_features & GF_NES) ? 0x1d :
+ CHARSET_MASK_TRANSPARENCY, _vm->gdi._textSurface.pitch * _vm->gdi._textSurface.h);
}
}
}
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- palette.cpp 17 Mar 2005 03:20:25 -0000 2.27
+++ palette.cpp 21 Mar 2005 01:15:30 -0000 2.28
@@ -60,7 +60,7 @@
setPalColor(0x1A,0x00,0x92,0x00);
setPalColor(0x1B,0x00,0xB6,0x6D);
setPalColor(0x1C,0x00,0x92,0x92);
- setPalColor(0x1D,0x00,0x00,0x00);
+ setPalColor(0x1D,0x24,0x24,0x24);
setPalColor(0x1E,0x00,0x00,0x00);
setPalColor(0x1F,0x00,0x00,0x00);
@@ -77,7 +77,7 @@
setPalColor(0x2A,0x00,0xFF,0x00);
setPalColor(0x2B,0x49,0xFF,0xDB);
setPalColor(0x2C,0x00,0xFF,0xFF);
- setPalColor(0x2D,0x00,0x00,0x00);
+ setPalColor(0x2D,0x49,0x49,0x49);
setPalColor(0x2E,0x00,0x00,0x00);
setPalColor(0x2F,0x00,0x00,0x00);
@@ -94,7 +94,7 @@
setPalColor(0x3A,0x92,0xFF,0x6D);
setPalColor(0x3B,0x49,0xFF,0xDB);
setPalColor(0x3C,0x92,0xDB,0xFF);
- setPalColor(0x3D,0x00,0x00,0x00);
+ setPalColor(0x3D,0x92,0x92,0x92);
setPalColor(0x3E,0x00,0x00,0x00);
setPalColor(0x3F,0x00,0x00,0x00);
}
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.261
retrieving revision 2.262
diff -u -d -r2.261 -r2.262
--- script_v2.cpp 16 Mar 2005 03:20:30 -0000 2.261
+++ script_v2.cpp 21 Mar 2005 01:15:30 -0000 2.262
@@ -1052,7 +1052,10 @@
sentenceline.bottom = virtscr[2].topline + 8;
sentenceline.left = 0;
sentenceline.right = 319;
- restoreBG(sentenceline);
+ if (_features & GF_NES)
+ restoreBG(sentenceline, 0x1d);
+ else
+ restoreBG(sentenceline);
drawString(2, (byte*)sentence);
}
@@ -1514,7 +1517,10 @@
rect.bottom = virtscr[2].topline + 8 * 88;
rect.left = 0;
rect.right = 319;
- restoreBG(rect);
+ if (_features & GF_NES)
+ restoreBG(rect, 0x1d);
+ else
+ restoreBG(rect);
// Draw all verbs and inventory
redrawVerbs();
More information about the Scummvm-git-logs
mailing list