[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.376,2.377
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Sun Nov 21 10:57:48 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv864
Modified Files:
gfx.cpp
Log Message:
Applied one of my suggested fixes for bug #1060568. Let's see if it causes
any regressions...
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.376
retrieving revision 2.377
diff -u -d -r2.376 -r2.377
--- gfx.cpp 13 Nov 2004 04:05:34 -0000 2.376
+++ gfx.cpp 21 Nov 2004 17:47:05 -0000 2.377
@@ -746,10 +746,7 @@
byte *screenBuf = vs->getPixels(0, 0);
if (vs->hasTwoBuffers && _vm->_currentRoom != 0 && _vm->isLightOn()) {
- if (vs->number == kMainVirtScreen) {
- // Clean out the charset mask
- memset(_vm->gdi._textSurface.pixels, CHARSET_MASK_TRANSPARENCY, _vm->gdi._textSurface.pitch * _vm->gdi._textSurface.h);
- } else {
+ if (vs->number != kMainVirtScreen) {
// Restore from back buffer
const byte *backBuf = vs->getBackPixels(0, 0);
blit(screenBuf, vs->pitch, backBuf, vs->pitch, vs->w, vs->h);
@@ -758,6 +755,11 @@
// Clear area
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);
+ }
}
}
More information about the Scummvm-git-logs
mailing list