[Scummvm-git-logs] scummvm master -> 054c970598f25f36ccc3841cb25d0c03879a0948

[sev-]

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:
054c970598 SCUMM: FT: fix bug #12022


Commit: 054c970598f25f36ccc3841cb25d0c03879a0948
    https://github.com/scummvm/scummvm/commit/054c970598f25f36ccc3841cb25d0c03879a0948
Author: Andrea Boscarino (andrea.boscarino at studio.unibo.it)
Date: 2020-12-25T23:12:42+01:00

Commit Message:
SCUMM: FT: fix bug #12022

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 374cf9798c..5c2800cee4 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -391,7 +391,18 @@ void ScummEngine_v7::processKeyboard(Common::KeyState lastKeyHit) {
 				_insane->escapeKeyHandler();
 			else
 				_smushVideoShouldFinish = true;
-			_skipVideo = true;
+
+			// WORKAROUND bug #12022: For some reason, skipping the cutscene in which Ben fires up
+			// his bike (after retrieving the keys from the bartender), will outright skip the first
+			// bike fight sequence. Because of this, the script which handles playing ambient and wind SFX
+			// outside the bar is never stopped, so those SFX are unintentionally played throughout the 
+			// rest of the game.
+			// This fix produces the intended behaviour from the original interpreter.
+			if (_game.id == GID_FT && vm.slot[_currentScript].number == 65 && _currentRoom == 6) {
+				_skipVideo = false;
+			} else {
+				_skipVideo = true;
+			}
 		} else {
 			abortCutscene();
 		}