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

MOHAWK: Read kLBEventNotified data after commands.

Browse Source 
This fixes some pages in Maggie's Farmyard Adventure, at least.
Thanks to clone2727 for testing this.

svn-id: r55538
This commit is contained in:
Alyssa Milburn 2011-01-25 17:35:53 +00:00
parent a3baa1874a
commit b79743b221
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/mohawk/livingbooks.cpp
View File

@ -1779,15 +1779,6 @@ LBScriptEntry *LBItem::parseScriptEntry(uint16 type, uint16 &size, Common::Seeka
entry->newUnknown, entry->newMode, entry->newPage, entry->newSubpage);
size -= 8;
}
if (entry->event == kLBEventNotified) {
if (size < 4)
error("not enough bytes (%d) in kLBEventNotified, opcode 0x%04x", size, entry->opcode);
entry->matchFrom = stream->readUint16();
entry->matchNotify = stream->readUint16();
debug(4, "kLBEventNotified: unknowns %04x, %04x",
entry->matchFrom, entry->matchNotify);
size -= 4;
}
if (entry->opcode == kLBOpSendExpression) {
if (size < 4)
error("not enough bytes (%d) in kLBOpSendExpression, event 0x%04x", size, entry->event);
@ -1814,7 +1805,7 @@ LBScriptEntry *LBItem::parseScriptEntry(uint16 type, uint16 &size, Common::Seeka
if (msgId != kLBCommand)
error("expected a command in script entry, got 0x%04x", msgId);
if (msgLen != size && !conditionTag)
if (msgLen != size - (entry->event == kLBEventNotified ? 4 : 0) && !conditionTag)
error("script entry msgLen %d is not equal to size %d", msgLen, size);
Common::String command = _vm->readString(stream);
@ -1827,6 +1818,15 @@ LBScriptEntry *LBItem::parseScriptEntry(uint16 type, uint16 &size, Common::Seeka
entry->command = command;
debug(4, "script entry command '%s'", command.c_str());
}
if (entry->event == kLBEventNotified) {
if (size < 4)
error("not enough bytes (%d) in kLBEventNotified, opcode 0x%04x", size, entry->opcode);
entry->matchFrom = stream->readUint16();
entry->matchNotify = stream->readUint16();
debug(4, "kLBEventNotified: unknowns %04x, %04x",
entry->matchFrom, entry->matchNotify);
size -= 4;
}
if (isSubentry) {
// TODO: subentries may be aligned, so this check is a bit too relaxed