[Scummvm-git-logs] scummvm master -> 4cbe4c340383c5cb5d5529f57274f242eccde0b0

[bluegr]

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:
4cbe4c3403 SCUMM: FT: update cutscene fix to account for Version B


Commit: 4cbe4c340383c5cb5d5529f57274f242eccde0b0
    https://github.com/scummvm/scummvm/commit/4cbe4c340383c5cb5d5529f57274f242eccde0b0
Author: Andrea Boscarino (andrea.boscarino at studio.unibo.it)
Date: 2020-12-30T01:43:19+02:00

Commit Message:
SCUMM: FT: update cutscene fix to account for Version B

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 5c2800cee4..8b716c6a80 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -398,7 +398,8 @@ void ScummEngine_v7::processKeyboard(Common::KeyState lastKeyHit) {
 			// 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) {
+			if (_game.id == GID_FT && _currentRoom == 6
+				&& (vm.slot[_currentScript].number == 65 || vm.slot[_currentScript].number == 64)) {
 				_skipVideo = false;
 			} else {
 				_skipVideo = true;