libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 00:12:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MOHAWK: Rename the Myst stack/card link maps

Browse Source 
svn-id: r54702
This commit is contained in:
Matthew Hoops 2010-12-01 14:57:05 +00:00
parent eeb557baab
commit 65a7d28e21
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/mohawk/myst_scripts.cpp
View File

@ -49,7 +49,7 @@ MystScriptEntry::~MystScriptEntry() {
delete[] argv; delete[] argv;
} }
const uint8 MystScriptParser::stack_map[11] = { const uint8 MystScriptParser::_stackMap[11] = {
kSeleniticStack, kSeleniticStack,
kStoneshipStack, kStoneshipStack,
kMystStack, kMystStack,
@ -63,7 +63,7 @@ const uint8 MystScriptParser::stack_map[11] = {
kMystStack kMystStack
}; };
const uint16 MystScriptParser::start_card[11] = { const uint16 MystScriptParser::_startCard[11] = {
1282, 1282,
2029, 2029,
4396, 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? // TODO: Play Flyby Entry Movie on Masterpiece Edition..? Only on Myst to Age Link?
_vm->changeToStack(stack_map[targetStack]); _vm->changeToStack(_stackMap[targetStack]);
_vm->changeToCard(start_card[targetStack], true); _vm->changeToCard(_startCard[targetStack], true);
handle = _vm->_sound->playSound(soundIdLinkDst); handle = _vm->_sound->playSound(soundIdLinkDst);
while (_vm->_mixer->isSoundHandleActive(*handle)) while (_vm->_mixer->isSoundHandleActive(*handle))

4
engines/mohawk/myst_scripts.h
View File

@ -141,8 +141,8 @@ protected:
uint16 _savedCursorId; uint16 _savedCursorId;
uint16 _tempVar; // Generic temp var used by the scripts uint16 _tempVar; // Generic temp var used by the scripts
static const uint8 stack_map[]; static const uint8 _stackMap[];
static const uint16 start_card[]; static const uint16 _startCard[];
void setupCommonOpcodes(); void setupCommonOpcodes();
void varUnusedCheck(uint16 op, uint16 var); void varUnusedCheck(uint16 op, uint16 var);

6
engines/mohawk/myst_stacks/myst.cpp
View File

@ -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 // 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. // up to the Cinepak versions of the video (the 'c' suffix) until the SVQ1 decoder is completed.
if ((_vm->getFeatures() & GF_ME)) { if ((_vm->getFeatures() & GF_ME)) {
switch (stack_map[_vm->_varStore->getVar(var)]) { switch (_stackMap[_vm->_varStore->getVar(var)]) {
case kSeleniticStack: case kSeleniticStack:
if (_vm->getPlatform() == Common::kPlatformMacintosh) if (_vm->getPlatform() == Common::kPlatformMacintosh)
_vm->_video->playMovieCentered(_vm->wrapMovieFilename("FLY_SEc", kMasterpieceOnly)); _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); uint16 varValue = _vm->_varStore->getVar(var);
_vm->changeToStack(stack_map[varValue]); _vm->changeToStack(_stackMap[varValue]);
_vm->changeToCard(start_card[varValue], true); _vm->changeToCard(_startCard[varValue], true);
// TODO: No soundIdLinkDst for Opcode 100 link? Check Original. // TODO: No soundIdLinkDst for Opcode 100 link? Check Original.
} }