[Scummvm-git-logs] scummvm master -> 15306581ab27c0ea9605b7d3909262b70226954c

[digitall]

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:
15306581ab SHERLOCK: RT: Disable Loading from GMM During Prolog or Credits.


Commit: 15306581ab27c0ea9605b7d3909262b70226954c
    https://github.com/scummvm/scummvm/commit/15306581ab27c0ea9605b7d3909262b70226954c
Author: D G Turner (digitall at scummvm.org)
Date: 2018-10-17T23:29:01+01:00

Commit Message:
SHERLOCK: RT: Disable Loading from GMM During Prolog or Credits.

Loading from the GMM during the prolog resulted in the mouse cursor
getting stuck hidden and possibly other game state issues, so best to
disable loading in these cases as already was done for saving.

This fixes bug Trac #10746.

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


diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 38466a9..a0f792d 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -204,6 +204,11 @@ void TattooEngine::saveConfig() {
 	ConfMan.flushToDisk();
 }
 
+bool TattooEngine::canLoadGameStateCurrently() {
+	TattooUserInterface &ui = *(TattooUserInterface *)_ui;
+	return _canLoadSave && !ui._creditsWidget.active() && !_runningProlog;
+}
+
 bool TattooEngine::canSaveGameStateCurrently() {
 	TattooUserInterface &ui = *(TattooUserInterface *)_ui;
 	return _canLoadSave && !ui._creditsWidget.active() && !_runningProlog;
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index 71872ab..eff8734 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -103,6 +103,11 @@ public:
 	virtual void saveConfig();
 
 	/**
+	 * Returns true if a savegame can be loaded
+	 */
+	virtual bool canLoadGameStateCurrently();
+
+	/**
 	 * Returns true if the game can be saved
 	 */
 	virtual bool canSaveGameStateCurrently();