libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fix regression in message workarounds

Browse Source 
Reverts an unintended change to the message recursion loop introduced in
56ea963cea that breaks the message stack
This commit is contained in:
sluicebox 2019-06-16 02:57:34 -07:00
parent 3d299df773
commit 5bb9174ad7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/sci/engine/message.cpp
View File

@ -245,7 +245,7 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
} else if (workaround.type == MSG_WORKAROUND_FAKE) {
// return a fake message record hard-coded in the workaround.
// this leaves the stack unchanged.
record.tuple = stack.top();
record.tuple = tuple;
record.refTuple = MessageTuple();
record.string = workaround.text;
record.length = strlen(workaround.text);
@ -262,7 +262,7 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
if (reader->findRecord(textTuple, textRecord)) {
uint32 textLength = (workaround.substringLength == 0) ? textRecord.length : workaround.substringLength;
if (workaround.substringIndex + textLength <= textRecord.length) {
record.tuple = stack.top();
record.tuple = tuple;
record.refTuple = MessageTuple();
record.string = textRecord.string + workaround.substringIndex;
record.length = textLength;
@ -274,9 +274,9 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
}
while (1) {
tuple = stack.top();
MessageTuple &t = stack.top();
if (!reader->findRecord(tuple, record)) {
if (!reader->findRecord(t, record)) {
// Tuple not found
if (recurse && (stack.size() > 1)) {
stack.pop();
@ -291,7 +291,7 @@ bool MessageState::getRecord(CursorStack &stack, bool recurse, MessageRecord &re
MessageTuple &ref = record.refTuple;
if (ref.noun || ref.verb || ref.cond) {
tuple.seq++;
t.seq++;
stack.push(ref);
continue;
}