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

mgerhardy noreply at scummvm.org
Thu Oct 24 05:32:05 UTC 2024


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:
fcab03efd6 TWINE: Glitched background during main menu idle credits


Commit: fcab03efd6cda1c023456632f608196900bd06c3
    https://github.com/scummvm/scummvm/commit/fcab03efd6cda1c023456632f608196900bd06c3
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2024-10-24T07:32:00+02:00

Commit Message:
TWINE: Glitched background during main menu idle credits

8ac2ed039fc3e3a3bbdf373d309153bee67b306b introduced the regression

Changed paths:
    engines/twine/menu/menu.cpp
    engines/twine/menu/menuoptions.cpp


diff --git a/engines/twine/menu/menu.cpp b/engines/twine/menu/menu.cpp
index 7a555c0ee67..1dc33c214a8 100644
--- a/engines/twine/menu/menu.cpp
+++ b/engines/twine/menu/menu.cpp
@@ -471,6 +471,7 @@ void Menu::menuDemo() {
 			}
 		}
 	}
+	_engine->_screens->loadMenuImage(false);
 }
 
 int32 Menu::doGameMenu(MenuSettings *menuSettings) {
@@ -952,7 +953,6 @@ EngineState Menu::run() {
 	}
 	case kDemoMenu: {
 		menuDemo();
-		_engine->_screens->loadMenuImage(false);
 		break;
 	}
 	case (int32)TextId::kQuit:
diff --git a/engines/twine/menu/menuoptions.cpp b/engines/twine/menu/menuoptions.cpp
index 159f87610f8..7dc06af736e 100644
--- a/engines/twine/menu/menuoptions.cpp
+++ b/engines/twine/menu/menuoptions.cpp
@@ -104,6 +104,7 @@ void MenuOptions::showCredits() {
 	_engine->_gameState->initEngineVars();
 	_engine->_scene->_numCube = LBA1SceneId::Credits_List_Sequence;
 	_engine->_scene->_newCube = LBA1SceneId::Credits_List_Sequence;
+	_engine->_screens->clearScreen();
 
 	flagCredits = true;
 	_engine->mainLoop();




More information about the Scummvm-git-logs mailing list