From 14990dc91b868816914fd731586e60bb297caeea Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sat, 4 Feb 2017 14:32:59 +0100 Subject: MOHAWK: Remove a hack that should not be needed anymore The script execution order should now be accurate --- engines/mohawk/riven_scripts.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index d77dbf5b23..27f0022446 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -579,12 +579,8 @@ void RivenSimpleCommand::activatePLST(uint16 op, uint16 argc, uint16 *argv) { // Command 40: activate SLST record (card ambient sound lists) void RivenSimpleCommand::activateSLST(uint16 op, uint16 argc, uint16 *argv) { - // WORKAROUND: Disable the SLST that is played during Riven's intro. - // Riven X does this too (spoke this over with Jeff) - if (_vm->getStack()->getId() == kStackTspit && _vm->getStack()->getCurrentCardGlobalId() == 0x6e9a && argv[0] == 2) - return; - _vm->_activatedSLST = true; + SLSTRecord slstRecord = _vm->getCard()->getSound(argv[0]); _vm->_sound->playSLST(slstRecord); } -- cgit v1.2.3