[Scummvm-git-logs] scummvm master -> be8170e12467b72b57df21fd5896d2662c72185b

[AndywinXp]

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

Summary:
3aa5c35faa SCUMM: GUI: Fix flashlight disappearing during old style pause banner
be8170e124 SCUMM: v0-2: Fix subtitle disappearing after pause


Commit: 3aa5c35faadc5a3a8a0933210794497809ae86b5
    https://github.com/scummvm/scummvm/commit/3aa5c35faadc5a3a8a0933210794497809ae86b5
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-09T00:47:02+02:00

Commit Message:
SCUMM: GUI: Fix flashlight disappearing during old style pause banner

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 20e1117ba22..269000a4c61 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -1292,11 +1292,13 @@ void ScummEngine::restoreCharsetBg() {
 				blit(screenBuf, vs->pitch, backBuf, vs->pitch, vs->w, vs->h, vs->format.bytesPerPixel);
 			}
 		} else {
-			// Clear area
-			if (_game.platform == Common::kPlatformNES)
-				memset(screenBuf, 0x1d, vs->h * vs->pitch);
-			else
-				memset(screenBuf, 0, vs->h * vs->pitch);
+			if (!(_game.version < 4 && _messageBannerActive && (getCurrentLights() & LIGHTMODE_flashlight_on))) {
+				// Clear area
+				if (_game.platform == Common::kPlatformNES)
+					memset(screenBuf, 0x1d, vs->h * vs->pitch);
+				else
+					memset(screenBuf, 0, vs->h * vs->pitch);
+			}
 		}
 
 		if (vs->hasTwoBuffers || _macScreen) {


Commit: be8170e12467b72b57df21fd5896d2662c72185b
    https://github.com/scummvm/scummvm/commit/be8170e12467b72b57df21fd5896d2662c72185b
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-08-09T00:47:02+02:00

Commit Message:
SCUMM: v0-2: Fix subtitle disappearing after pause

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 0073a37f946..4210000c092 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -412,7 +412,9 @@ Common::KeyState ScummEngine::printMessageAndPause(const char *msg, int color, i
 	if (waitTime) {
 		ScummEngine::drawDirtyScreenParts();
 		waitForBannerInput(waitTime, ks, leftBtnPressed, rightBtnPressed);
-		stopTalk();
+
+		if (!drawOnSentenceLine)
+			stopTalk();
 	}
 
 	if (drawOnSentenceLine) {