diff options
| -rw-r--r-- | engines/mohawk/myst_scripts.cpp | 15 | ||||
| -rw-r--r-- | engines/mohawk/myst_stacks/selenitic.cpp | 1 |
2 files changed, 7 insertions, 9 deletions
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index b650ff6d2f..9c21887e43 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -867,15 +867,12 @@ void MystScriptParser::o_changeStack(uint16 op, uint16 var, uint16 argc, uint16 // TODO: Play Flyby Entry Movie on Masterpiece Edition..? Only on Myst to Age Link? - // TODO: Fix properly. Past this point the class may have been destroyed - // and thus class instance data is not available anymore - MohawkEngine_Myst *vm = _vm; - vm->changeToStack(stack_map[targetStack]); - vm->changeToCard(start_card[targetStack], true); - - handle = vm->_sound->playSound(soundIdLinkDst); - while (vm->_mixer->isSoundHandleActive(*handle)) - vm->_system->delayMillis(10); + _vm->changeToStack(stack_map[targetStack]); + _vm->changeToCard(start_card[targetStack], true); + + handle = _vm->_sound->playSound(soundIdLinkDst); + while (_vm->_mixer->isSoundHandleActive(*handle)) + _vm->_system->delayMillis(10); } } else unknown(op, var, argc, argv); diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp index 84cb1f884d..daf4953561 100644 --- a/engines/mohawk/myst_stacks/selenitic.cpp +++ b/engines/mohawk/myst_stacks/selenitic.cpp @@ -43,6 +43,7 @@ MystScriptParser_Selenitic::MystScriptParser_Selenitic(MohawkEngine_Myst *vm) : setupOpcodes(); _invokingResource = NULL; _mazeRunnerPosition = 288; + _mazeRunnerDirection = 8; } MystScriptParser_Selenitic::~MystScriptParser_Selenitic() { |