aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2018-10-17 23:29:01 +0100
committerD G Turner2018-10-17 23:29:01 +0100
commit15306581ab27c0ea9605b7d3909262b70226954c (patch)
tree7d0b55725b4071d27ac9701735e99ed95103bb0a /engines
parent8a374bdf0c9ab5df77c43a4e89249144e123e4cd (diff)
downloadscummvm-rg350-15306581ab27c0ea9605b7d3909262b70226954c.tar.gz
scummvm-rg350-15306581ab27c0ea9605b7d3909262b70226954c.tar.bz2
scummvm-rg350-15306581ab27c0ea9605b7d3909262b70226954c.zip
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.
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/tattoo/tattoo.cpp5
-rw-r--r--engines/sherlock/tattoo/tattoo.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 38466a9459..a0f792dea9 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 71872ab1b9..eff8734d62 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();