diff options
| -rw-r--r-- | engines/mohawk/myst_scripts.cpp | 8 | ||||
| -rw-r--r-- | engines/mohawk/myst_scripts.h | 4 | ||||
| -rw-r--r-- | engines/mohawk/myst_stacks/myst.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index c4bc72c82b..1f1d256463 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -49,7 +49,7 @@ MystScriptEntry::~MystScriptEntry() { delete[] argv; } -const uint8 MystScriptParser::stack_map[11] = { +const uint8 MystScriptParser::_stackMap[11] = { kSeleniticStack, kStoneshipStack, kMystStack, @@ -63,7 +63,7 @@ const uint8 MystScriptParser::stack_map[11] = { kMystStack }; -const uint16 MystScriptParser::start_card[11] = { +const uint16 MystScriptParser::_startCard[11] = { 1282, 2029, 4396, @@ -863,8 +863,8 @@ 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? - _vm->changeToStack(stack_map[targetStack]); - _vm->changeToCard(start_card[targetStack], true); + _vm->changeToStack(_stackMap[targetStack]); + _vm->changeToCard(_startCard[targetStack], true); handle = _vm->_sound->playSound(soundIdLinkDst); while (_vm->_mixer->isSoundHandleActive(*handle)) diff --git a/engines/mohawk/myst_scripts.h b/engines/mohawk/myst_scripts.h index 69389fe28b..c0e1bf2e66 100644 --- a/engines/mohawk/myst_scripts.h +++ b/engines/mohawk/myst_scripts.h @@ -141,8 +141,8 @@ protected: uint16 _savedCursorId; uint16 _tempVar; // Generic temp var used by the scripts - static const uint8 stack_map[]; - static const uint16 start_card[]; + static const uint8 _stackMap[]; + static const uint16 _startCard[]; void setupCommonOpcodes(); void varUnusedCheck(uint16 op, uint16 var); diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp index a072e560c4..547c432cf8 100644 --- a/engines/mohawk/myst_stacks/myst.cpp +++ b/engines/mohawk/myst_stacks/myst.cpp @@ -178,7 +178,7 @@ void MystScriptParser_Myst::opcode_100(uint16 op, uint16 var, uint16 argc, uint1 // Play Flyby Entry Movie on Masterpiece Edition. The Macintosh version is currently hooked // up to the Cinepak versions of the video (the 'c' suffix) until the SVQ1 decoder is completed. if ((_vm->getFeatures() & GF_ME)) { - switch (stack_map[_vm->_varStore->getVar(var)]) { + switch (_stackMap[_vm->_varStore->getVar(var)]) { case kSeleniticStack: if (_vm->getPlatform() == Common::kPlatformMacintosh) _vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_SEc", kMasterpieceOnly)); @@ -218,8 +218,8 @@ void MystScriptParser_Myst::opcode_100(uint16 op, uint16 var, uint16 argc, uint1 } uint16 varValue = _vm->_varStore->getVar(var); - _vm->changeToStack(stack_map[varValue]); - _vm->changeToCard(start_card[varValue], true); + _vm->changeToStack(_stackMap[varValue]); + _vm->changeToCard(_startCard[varValue], true); // TODO: No soundIdLinkDst for Opcode 100 link? Check Original. } |