thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Implement retrieving the invoking resource from data for init and exit scripts.

Browse source 
svn-id: r54639
This commit is contained in:
Bastien Bouclet 2010-11-29 21:01:30 +00:00
parent 3bd40b0d4b
commit c393f8f9d2
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/mohawk/myst_scripts.cpp
View file

@ -41,7 +41,7 @@ MystScriptEntry::MystScriptEntry() {
var = 0; var = 0;
argc = 0; argc = 0;
argv = 0; argv = 0;
u0 = 0; resourceId = 0;
u1 = 0; u1 = 0;
} }
@ -154,12 +154,17 @@ void MystScriptParser::setupOpcodes() {
} }
void MystScriptParser::runScript(MystScript script, MystResource *invokingResource) { void MystScriptParser::runScript(MystScript script, MystResource *invokingResource) {
_invokingResource = invokingResource;
debugC(kDebugScript, "Script Size: %d", script->size()); debugC(kDebugScript, "Script Size: %d", script->size());
for (uint16 i = 0; i < script->size(); i++) { for (uint16 i = 0; i < script->size(); i++) {
MystScriptEntry &entry = script->operator[](i); MystScriptEntry &entry = script->operator[](i);
debugC(kDebugScript, "\tOpcode %d: %d", i, entry.opcode); debugC(kDebugScript, "\tOpcode %d: %d", i, entry.opcode);
if (entry.type == kMystScriptNormal) {
_invokingResource = invokingResource;
} else {
_invokingResource = _vm->_resources[entry.resourceId];
}
runOpcode(entry.opcode, entry.var, entry.argc, entry.argv); runOpcode(entry.opcode, entry.var, entry.argc, entry.argv);
} }
} }
@ -202,7 +207,7 @@ MystScript MystScriptParser::readScript(Common::SeekableReadStream *stream, Myst
// u0 only exists in INIT and EXIT scripts // u0 only exists in INIT and EXIT scripts
if (type != kMystScriptNormal) if (type != kMystScriptNormal)
entry.u0 = stream->readUint16LE(); entry.resourceId = stream->readUint16LE();
entry.opcode = stream->readUint16LE(); entry.opcode = stream->readUint16LE();
entry.var = stream->readUint16LE(); entry.var = stream->readUint16LE();

2
engines/mohawk/myst_scripts.h
View file

@ -49,7 +49,7 @@ struct MystScriptEntry {
~MystScriptEntry(); ~MystScriptEntry();
MystScriptType type; MystScriptType type;
uint16 u0; uint16 resourceId;
uint16 opcode; uint16 opcode;
uint16 var; uint16 var;
uint16 argc; uint16 argc;