[Scummvm-cvs-logs] scummvm master -> 169404b5f00bebc625e887183526923d5830f342

[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:
169404b5f0 SHERLOCK: RT: Don't allow skipping intro until title is shown


Commit: 169404b5f00bebc625e887183526923d5830f342
    https://github.com/scummvm/scummvm/commit/169404b5f00bebc625e887183526923d5830f342
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-16T15:01:57-04:00

Commit Message:
SHERLOCK: RT: Don't allow skipping intro until title is shown

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



diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp
index 82963cd..66bba31 100644
--- a/engines/sherlock/tattoo/tattoo.cpp
+++ b/engines/sherlock/tattoo/tattoo.cpp
@@ -98,6 +98,11 @@ void TattooEngine::startScene() {
 			ui._mask1 = _res->load("res08a.msk");
 		break;
 
+	case STARTING_INTRO_SCENE:
+		// Disable input so that the intro can't be skipped until the game's logo has been shown
+		ui._lockoutTimer = STARTUP_KEYS_DISABLED_DELAY;
+		break;
+
 	case OVERHEAD_MAP:
 	case OVERHEAD_MAP2:
 		// Show the map
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.h b/engines/sherlock/tattoo/tattoo_user_interface.h
index a93743c..c92ff21 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.h
+++ b/engines/sherlock/tattoo/tattoo_user_interface.h
@@ -41,7 +41,10 @@ namespace Sherlock {
 
 namespace Tattoo {
 
-#define BUTTON_SIZE 15				// Button width/height
+// Button width/height
+#define BUTTON_SIZE 15				
+// How long to play the intro before it can be skipped
+#define STARTUP_KEYS_DISABLED_DELAY 200
 
 class WidgetBase;
 
@@ -55,7 +58,6 @@ public:
 class TattooUserInterface : public UserInterface {
 	friend class WidgetBase;
 private:
-	int _lockoutTimer;
 	int _scriptZone;
 	int _cAnimFramePause;
 	WidgetInventory _inventoryWidget;
@@ -104,6 +106,7 @@ public:
 	Common::SeekableReadStream *_mask, *_mask1;
 	Common::Point _maskOffset;
 	int _maskCounter;
+	int _lockoutTimer;
 	ImageFile *_interfaceImages;
 	WidgetCredits _creditsWidget;
 	WidgetOptions _optionsWidget;