diff options
| author | Paul Gilbert | 2015-08-16 15:01:57 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-16 15:01:57 -0400 |
| commit | 169404b5f00bebc625e887183526923d5830f342 (patch) | |
| tree | 4c46c0946e24bcaf3e62b46b106a44ff5e7aa5dc | |
| parent | 1a9b30a9d3f30c708f2a676d6d9a3aa29a24e39b (diff) | |
| download | scummvm-rg350-169404b5f00bebc625e887183526923d5830f342.tar.gz scummvm-rg350-169404b5f00bebc625e887183526923d5830f342.tar.bz2 scummvm-rg350-169404b5f00bebc625e887183526923d5830f342.zip | |
SHERLOCK: RT: Don't allow skipping intro until title is shown
| -rw-r--r-- | engines/sherlock/tattoo/tattoo.cpp | 5 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_user_interface.h | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/engines/sherlock/tattoo/tattoo.cpp b/engines/sherlock/tattoo/tattoo.cpp index 82963cd953..66bba311f2 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 a93743c9e4..c92ff21dd1 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; |