[Scummvm-git-logs] scummvm master -> 9f1867f881e9f4b3952617861626847ed00a07fd

[AndywinXp]

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:
9f1867f881 SCUMM: HE100+: Fix room solid color fill redraw not working


Commit: 9f1867f881e9f4b3952617861626847ed00a07fd
    https://github.com/scummvm/scummvm/commit/9f1867f881e9f4b3952617861626847ed00a07fd
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-06-23T19:49:54+02:00

Commit Message:
SCUMM: HE100+: Fix room solid color fill redraw not working

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index e00ea6e0e8f..9e3c10a42de 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -2533,13 +2533,12 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs) {
 	case BMCOMP_SOLID_COLOR_FILL:
 	{
 		WizRawPixel color = (WizRawPixel)(*bmapPtr);
+		if (_vm->_game.heversion > 99 && _vm->VAR_COLOR_BLACK != 0xFF && _vm->VAR(_vm->VAR_COLOR_BLACK) == color)
+			break;
 
 		if (_vm->_game.heversion > 90)
 			color = ((ScummEngine_v71he *)_vm)->_wiz->convert8BppToRawPixel(*bmapPtr, (WizRawPixel *)_vm->getHEPaletteSlot(1));
 
-		if (_vm->_game.heversion > 99 && _vm->VAR_COLOR_BLACK != 0xFF && _vm->VAR(_vm->VAR_COLOR_BLACK) == color)
-			break;
-
 		WizSimpleBitmap dstBitmap;
 		dstBitmap.bufferPtr = WizPxShrdBuffer(dst, false);
 		dstBitmap.bitmapWidth = vs->w;