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

[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:
e9455457a8 SHERLOCK: RT: Don't allow saving when credits are active


Commit: e9455457a896aa5020d8e5ec3489b4580c5056b0
    https://github.com/scummvm/scummvm/commit/e9455457a896aa5020d8e5ec3489b4580c5056b0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-08T11:42:25-04:00

Commit Message:
SHERLOCK: RT: Don't allow saving when credits are active

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 889a042..b11615a 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -194,6 +194,11 @@ void TattooEngine::saveConfig() {
 	ConfMan.flushToDisk();
 }
 
+bool TattooEngine::canSaveGameStateCurrently() {
+	TattooUserInterface &ui = *(TattooUserInterface *)_ui;
+	return _canLoadSave && !ui._creditsWidget.active();
+}
+
 } // End of namespace Tattoo
 
 } // End of namespace Sherlock
diff --git a/engines/sherlock/tattoo/tattoo.h b/engines/sherlock/tattoo/tattoo.h
index 022a0ad..71872ab 100644
--- a/engines/sherlock/tattoo/tattoo.h
+++ b/engines/sherlock/tattoo/tattoo.h
@@ -101,6 +101,11 @@ public:
 	 * Save the game configuration
 	 */
 	virtual void saveConfig();
+
+	/**
+	 * Returns true if the game can be saved
+	 */
+	virtual bool canSaveGameStateCurrently();
 };
 
 } // End of namespace Tattoo