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

[bgK]

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:
40cb2f81e7 MOHAWK: RIVEN: Menu related fixes
ce0773eaf9 MOHAWK: MYST: Menu related fixes


Commit: 40cb2f81e7edd56673fb9688c319ac9c47083273
    https://github.com/scummvm/scummvm/commit/40cb2f81e7edd56673fb9688c319ac9c47083273
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-04-08T20:19:18+02:00

Commit Message:
MOHAWK: RIVEN: Menu related fixes

* Allow showing the GMM using F5 during cutscenes in the CD/DVD version
* Autosave when quitting from the GMM when it was opened using F5
* Allow changing the language when clicking the options button in the
  main menu in the 25th edition

Refs #11399.

Changed paths:
    engines/mohawk/dialogs.cpp
    engines/mohawk/riven.cpp


diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp
index 9387ad2b8d..45b659a2e3 100644
--- a/engines/mohawk/dialogs.cpp
+++ b/engines/mohawk/dialogs.cpp
@@ -333,7 +333,7 @@ RivenOptionsWidget::RivenOptionsWidget(GuiObject *boss, const Common::String &na
 	if (is25th && g_engine) {
 		bool canChangeLanguage = true;
 		MohawkEngine_Riven *vm = static_cast<MohawkEngine_Riven *>(g_engine);
-		canChangeLanguage = vm->isInteractive();
+		canChangeLanguage = vm->isInteractive() || vm->isInMainMenu();
 
 		GUI::StaticTextWidget *languageCaption = new GUI::StaticTextWidget(widgetsBoss(), "RivenOptionsDialog.LanguageDesc", _("Language:"));
 		languageCaption->setAlign(Graphics::kTextAlignRight);
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index f799b698fe..542e72eb24 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -199,6 +199,9 @@ Common::Error MohawkEngine_Riven::run() {
 	while (!hasGameEnded())
 		doFrame();
 
+	// Attempt to autosave before exiting from the GMM / when closing the window
+	saveAutosaveIfEnabled();
+
 	return Common::kNoError;
 }
 
@@ -275,7 +278,7 @@ void MohawkEngine_Riven::processInput() {
 					} else {
 						resumeFromMainMenu();
 					}
-				} else if (!_scriptMan->hasQueuedScripts()) {
+				} else {
 					openMainMenuDialog();
 				}
 				break;
@@ -302,11 +305,6 @@ void MohawkEngine_Riven::processInput() {
 				break;
 			}
 			break;
-		case Common::EVENT_QUIT:
-		case Common::EVENT_RTL:
-			// Attempt to autosave before exiting
-			saveAutosaveIfEnabled();
-			break;
 		default:
 			break;
 		}


Commit: ce0773eaf9c20695e424a7724abfef97dfa702d3
    https://github.com/scummvm/scummvm/commit/ce0773eaf9c20695e424a7724abfef97dfa702d3
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-04-08T20:19:18+02:00

Commit Message:
MOHAWK: MYST: Menu related fixes

* Allow showing the GMM using F5 during cutscenes in the non 25th
  versions.
* Autosave when quitting from the GMM when it was opened using F5

Changed paths:
    engines/mohawk/dialogs.cpp
    engines/mohawk/myst.cpp


diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp
index 45b659a2e3..18219ef13c 100644
--- a/engines/mohawk/dialogs.cpp
+++ b/engines/mohawk/dialogs.cpp
@@ -297,6 +297,7 @@ void MystMenuDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint3
 	}
 	case kQuitCmd:
 		close();
+		vm->saveAutosaveIfEnabled();
 		vm->runCredits();
 		break;
 	default:
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 29a4bb962d..151b5c3627 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -741,9 +741,7 @@ void MohawkEngine_Myst::doAction(MystEventAction action) {
 			break;
 		}
 
-		if (isInteractive()) {
-			openMainMenuDialog();
-		}
+		openMainMenuDialog();
 
 		break;
 	case kMystActionSkip: