From 691900c64543d80b0a319ea79fa7cd80cda596da Mon Sep 17 00:00:00 2001 From: AndywinXp Date: Sun, 22 May 2022 21:34:00 +0200 Subject: [PATCH] SCUMM: Enable snap scroll only for games which actually feature it This also gets rid of a bug in which in MANIAC V1, the Edna trigger point at the beginning of the game can be totally bypassed, breaking the game. In order to get rid of this whole class of bugs, we only enable snap scrolling only for the games which were designed for it. --- engines/scumm/input.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 2d7fbdfea15..629aa3679d9 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -545,7 +545,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { bool talkstopKeyEnabled = (VAR_TALKSTOP_KEY == 0xFF || VAR(VAR_TALKSTOP_KEY) != 0); bool cutsceneExitKeyEnabled = (VAR_CUTSCENEEXIT_KEY == 0xFF || VAR(VAR_CUTSCENEEXIT_KEY) != 0); bool mainmenuKeyEnabled = (VAR_MAINMENU_KEY == 0xFF || VAR(VAR_MAINMENU_KEY) != 0); - bool snapScrollKeyEnabled = (_game.version <= 2 || VAR_CAMERA_FAST_X != 0xFF); + bool snapScrollKeyEnabled = (_game.version >= 2 && _game.version <= 4); // In FM-TOWNS games F8 / restart is always enabled if (_game.platform == Common::kPlatformFMTowns)