[Scummvm-git-logs] scummvm master -> 99545af5c82bd98c18da9d31902ff7491caf29c8

[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:
99545af5c8 SCUMM: GUI: Fix text disappearing during banner on room 0


Commit: 99545af5c82bd98c18da9d31902ff7491caf29c8
    https://github.com/scummvm/scummvm/commit/99545af5c82bd98c18da9d31902ff7491caf29c8
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-09-18T23:51:40+02:00

Commit Message:
SCUMM: GUI: Fix text disappearing during banner on room 0

This should fix the "Meanwhile..." text disappearing during pause
on Monkey Island 1

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 2d9ff3c2c73..3c416208d32 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -120,7 +120,7 @@ Common::KeyState ScummEngine::showBannerAndPause(int bannerId, int32 waitTime, c
 	// Backup the text surface...
 	if (_game.version < 7 && !_mainMenuIsActive && _game.platform != Common::kPlatformFMTowns) {
 		saveSurfacesPreGUI();
-		if (_charset->_textScreenID == kMainVirtScreen && !(_game.version == 4 && _game.id == GID_LOOM))
+		if (_currentRoom != 0 && _charset->_textScreenID == kMainVirtScreen && !(_game.version == 4 && _game.id == GID_LOOM))
 			restoreCharsetBg();
 	}
 
@@ -460,7 +460,7 @@ Common::KeyState ScummEngine::showOldStyleBannerAndPause(const char *msg, int co
 	// Backup the text surface...
 	if (!_mainMenuIsActive) {
 		saveSurfacesPreGUI();
-		if (_charset->_textScreenID == kMainVirtScreen && _game.id != GID_LOOM) {
+		if (_currentRoom != 0 && _charset->_textScreenID == kMainVirtScreen && _game.id != GID_LOOM) {
 			restoreCharsetBg();
 		}
 	}