diff options
| author | Bastien Bouclet | 2017-02-04 14:32:59 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-03 08:50:10 +0200 |
| commit | 14990dc91b868816914fd731586e60bb297caeea (patch) | |
| tree | 1780545a713b17492153e4da8524ebe916504e5a | |
| parent | 313d53234bb0036951b9e5b6353a294aef917e3a (diff) | |
| download | scummvm-rg350-14990dc91b868816914fd731586e60bb297caeea.tar.gz scummvm-rg350-14990dc91b868816914fd731586e60bb297caeea.tar.bz2 scummvm-rg350-14990dc91b868816914fd731586e60bb297caeea.zip | |
MOHAWK: Remove a hack that should not be needed anymore
The script execution order should now be accurate
| -rw-r--r-- | engines/mohawk/riven_scripts.cpp | 6 |
1 files changed, 1 insertions, 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); } |