[Scummvm-cvs-logs] scummvm master -> b29413965cc765325f2913242ce777088bb2f9e9

[dreammaster]

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:
b29413965c SHERLOCK: RT: Show the GMM if user clicks when credits are being displayed


Commit: b29413965cc765325f2913242ce777088bb2f9e9
    https://github.com/scummvm/scummvm/commit/b29413965cc765325f2913242ce777088bb2f9e9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-08T12:09:15-04:00

Commit Message:
SHERLOCK: RT: Show the GMM if user clicks when credits are being displayed

Changed paths:
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 7147197..275ba2f 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -378,6 +378,17 @@ void TattooUserInterface::doStandardControl() {
 	if (vm._runningProlog)
 		return;
 
+	// When the end credits are active, any press will open the ScummVM global main menu
+	if (_creditsWidget.active()) {
+		if (_keyState.keycode || events._released || events._rightReleased) {
+			vm._canLoadSave = true;
+			vm.openMainMenuDialog();
+			vm._canLoadSave = false;
+		}
+
+		return;
+	}
+
 	// Display the names of any Objects the cursor is pointing at
 	displayObjectNames();