[Scummvm-cvs-logs] scummvm master -> 724b22e5c7cbd0ebf3f605adff7a08242dba3a13

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
724b22e5c7 SCUMM FM-TOWNS: add number of color check in TownsScreen::updateOutputBuffer()


Commit: 724b22e5c7cbd0ebf3f605adff7a08242dba3a13
    https://github.com/scummvm/scummvm/commit/724b22e5c7cbd0ebf3f605adff7a08242dba3a13
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-13T13:35:01-07:00

Commit Message:
SCUMM FM-TOWNS: add number of color check in TownsScreen::updateOutputBuffer()

Although the 16 color surface is normally not on bottom, there could (theoretically?) be cases in 8bit fallback mode where this becomes relevant.

Changed paths:
    engines/scumm/gfx_towns.cpp



diff --git a/engines/scumm/gfx_towns.cpp b/engines/scumm/gfx_towns.cpp
index 10d6ee0..cdccd3e 100644
--- a/engines/scumm/gfx_towns.cpp
+++ b/engines/scumm/gfx_towns.cpp
@@ -458,7 +458,7 @@ void TownsScreen::updateOutputBuffer() {
 			}
 
 			for (int y = r->top; y <= r->bottom; ++y) {
-				if (l->bpp == _bpp && l->scaleW == 1 && l->onBottom) {
+				if (l->bpp == _bpp && l->scaleW == 1 && l->onBottom && l->numCol & 0xff00) {
 					memcpy(dst, &l->bltInternY[y][l->bltInternX[r->left]], (r->right + 1 - r->left) * _bpp);
 					dst += _pitch;