[Scummvm-git-logs] scummvm master -> 8f778d9035114debece35310f5122f42dfbe3c27

[bgK]

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:
8f778d9035 MOHAWK: Fix escape opening the GMM in the 25th edition games


Commit: 8f778d9035114debece35310f5122f42dfbe3c27
    https://github.com/scummvm/scummvm/commit/8f778d9035114debece35310f5122f42dfbe3c27
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-04-18T09:08:35+02:00

Commit Message:
MOHAWK: Fix escape opening the GMM in the 25th edition games

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


diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index cdde287c8d..4b91e260e8 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -741,7 +741,9 @@ void MohawkEngine_Myst::doAction(MystEventAction action) {
 			break;
 		}
 
-		openMainMenuDialog();
+		if (!isGameVariant(GF_25TH)) {
+			openMainMenuDialog();
+		}
 
 		break;
 	case kMystActionSkip:
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 122e820425..47dc9a129d 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -278,7 +278,7 @@ void MohawkEngine_Riven::processInput() {
 					} else {
 						resumeFromMainMenu();
 					}
-				} else {
+				} else if (!isGameVariant(GF_25TH)) {
 					openMainMenuDialog();
 				}
 				break;