[Scummvm-git-logs] scummvm master -> 69f63571356784239e42c1d26375974c73a3de72

[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:
69f6357135 SCUMM: (LOOM/FM-Towns) - fix regression


Commit: 69f63571356784239e42c1d26375974c73a3de72
    https://github.com/scummvm/scummvm/commit/69f63571356784239e42c1d26375974c73a3de72
Author: athrxx (athrxx at scummvm.org)
Date: 2024-05-04T19:28:22+02:00

Commit Message:
SCUMM: (LOOM/FM-Towns) - fix regression

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index dd32a51be76..83ca5c4bae1 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -1314,7 +1314,7 @@ void ScummEngine::clearCharsetMask() {
 
 void ScummEngine::clearTextSurface() {
 	towns_fillTopLayerRect(0, 0, _textSurface.w, _textSurface.h, 0);
-	fill((byte *)_textSurface.getPixels(),  _textSurface.pitch,
+	fill((byte *)_textSurface.getPixels(), _textSurface.pitch,
 #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
 		_game.platform == Common::kPlatformFMTowns ? 0 :
 #endif
@@ -1591,7 +1591,8 @@ void ScummEngine::drawBox(int x, int y, int x2, int y2, int color) {
 				if (_game.version == 3 && vs->number != kTextVirtScreen) {
 					towns_fillTopLayerRect(x * _textSurfaceMultiplier,
 						(y - _screenTop + vs->topline) * _textSurfaceMultiplier, width * _textSurfaceMultiplier, height * _textSurfaceMultiplier, color);
-					return;
+					// We still need to continue and make the same changes to the textSurface (the original FM-Towns
+					// SCUMM3 interpreters don't have that, everything goes directly onto screen layer 2 there).
 				}
 
 				if (vs->number == kBannerVirtScreen) {