diff options
author | Matthew Hoops | 2014-05-03 22:55:50 -0400 |
---|---|---|
committer | Matthew Hoops | 2014-05-03 22:55:50 -0400 |
commit | 0a899876e760419b913495e17052da2903371cb6 (patch) | |
tree | 8154a9e8f965a6d69cbfbcc3f48a3949ac681796 /engines/mohawk/riven_scripts.cpp | |
parent | 363b23f55d3bf143f1c3221fc6ea7d523bb06ea1 (diff) | |
download | scummvm-rg350-0a899876e760419b913495e17052da2903371cb6.tar.gz scummvm-rg350-0a899876e760419b913495e17052da2903371cb6.tar.bz2 scummvm-rg350-0a899876e760419b913495e17052da2903371cb6.zip |
MOHAWK: Use original stack ID mapping for Riven
Diffstat (limited to 'engines/mohawk/riven_scripts.cpp')
-rw-r--r-- | engines/mohawk/riven_scripts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 06b6afdf30..29ee5cd50b 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -403,7 +403,7 @@ void RivenScript::stopSound(uint16 op, uint16 argc, uint16 *argv) { // would cause all ambient sounds not to play. An alternative // fix would be to stop all scripts on a stack change, but this // does fine for now. - if (_vm->getCurStack() == tspit && (_vm->getCurCardRMAP() == 0x6e9a || _vm->getCurCardRMAP() == 0xfeeb)) + if (_vm->getCurStack() == kStackTspit && (_vm->getCurCardRMAP() == 0x6e9a || _vm->getCurCardRMAP() == 0xfeeb)) return; // The argument is a bitflag for the setting. @@ -586,7 +586,7 @@ void RivenScript::activatePLST(uint16 op, uint16 argc, uint16 *argv) { void RivenScript::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->getCurStack() == tspit && _vm->getCurCardRMAP() == 0x6e9a && argv[0] == 2) + if (_vm->getCurStack() == kStackTspit && _vm->getCurCardRMAP() == 0x6e9a && argv[0] == 2) return; _vm->_sound->playSLST(argv[0], _vm->getCurCard()); |