[Scummvm-git-logs] scummvm branch-2-6 -> bdc149bd5e80b8351f699a49bfe554b69470d351

[mgerhardy]

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:
bdc149bd5e TWINE: credits are no longer playing on inactivity at the in-game options, too


Commit: bdc149bd5e80b8351f699a49bfe554b69470d351
    https://github.com/scummvm/scummvm/commit/bdc149bd5e80b8351f699a49bfe554b69470d351
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2022-06-15T17:50:13+02:00

Commit Message:
TWINE: credits are no longer playing on inactivity at the in-game options, too

see https://bugs.scummvm.org/ticket/13581

Changed paths:
    engines/twine/menu/menu.cpp
    engines/twine/menu/menu.h
    engines/twine/scene/gamestate.cpp


diff --git a/engines/twine/menu/menu.cpp b/engines/twine/menu/menu.cpp
index fd85df6d950..25ec638d71e 100644
--- a/engines/twine/menu/menu.cpp
+++ b/engines/twine/menu/menu.cpp
@@ -422,7 +422,7 @@ int16 Menu::drawButtons(MenuSettings *menuSettings, bool hover) {
 	return mouseActiveButton;
 }
 
-int32 Menu::processMenu(MenuSettings *menuSettings, bool showCredits) {
+int32 Menu::processMenu(MenuSettings *menuSettings) {
 	int16 currentButton = menuSettings->getActiveButton();
 	bool buttonsNeedRedraw = true;
 	const int32 numEntry = menuSettings->getButtonCount();
@@ -613,7 +613,7 @@ int32 Menu::processMenu(MenuSettings *menuSettings, bool showCredits) {
 			}
 			startMillis = loopMillis;
 		}
-		if (showCredits && loopMillis - startMillis > 11650) {
+		if (!_engine->_scene->isGameRunning() && loopMillis - startMillis > 11650) {
 			// TODO: lba2 only show the credits only in the main menu and you could force it by pressing shift+c
 			// TODO: lba2 has a cd audio track (2) for the credits
 			_engine->_menuOptions->showCredits();
diff --git a/engines/twine/menu/menu.h b/engines/twine/menu/menu.h
index da31ec3e02f..8e20945963d 100644
--- a/engines/twine/menu/menu.h
+++ b/engines/twine/menu/menu.h
@@ -223,7 +223,7 @@ public:
 	 * @param menuSettings menu settings array with the information to build the menu options
 	 * @return pressed menu button identification
 	 */
-	int32 processMenu(MenuSettings *menuSettings, bool showCredits = true);
+	int32 processMenu(MenuSettings *menuSettings);
 
 	bool init();
 
diff --git a/engines/twine/scene/gamestate.cpp b/engines/twine/scene/gamestate.cpp
index b1514ad4904..3ef48173ee9 100644
--- a/engines/twine/scene/gamestate.cpp
+++ b/engines/twine/scene/gamestate.cpp
@@ -459,7 +459,7 @@ void GameState::processGameChoices(TextId choiceIdx) {
 
 	_engine->_text->drawAskQuestion(choiceIdx);
 
-	_engine->_menu->processMenu(&_gameChoicesSettings, false);
+	_engine->_menu->processMenu(&_gameChoicesSettings);
 	const int16 activeButton = _gameChoicesSettings.getActiveButton();
 	_choiceAnswer = _gameChoices[activeButton];