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

SHERLOCK: Fix mixups with sequence stack and script stack

Browse source
This commit is contained in:
Paul Gilbert 2015-04-12 19:11:34 -05:00
parent c9890cbacc
commit e8e095aa2a
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sherlock/talk.cpp
View file

@ -883,7 +883,7 @@ void Talk::pullSequence() {
if (_scriptStack.empty())
return;
SequenceEntry seq = _scriptStack.pop();
SequenceEntry seq = _sequenceStack.pop();
if (seq._objNum != -1) {
Object &obj = scene._bgShapes[seq._objNum];
@ -911,7 +911,7 @@ void Talk::pushSequence(int speaker) {
if (speaker == -1)
return;
ScriptStackEntry seqEntry;
SequenceEntry seqEntry;
if (!speaker) {
seqEntry._objNum = -1;
} else {
@ -925,7 +925,7 @@ void Talk::pushSequence(int speaker) {
seqEntry._seqTo = obj._seqTo;
}
_scriptStack.push(seqEntry);
_sequenceStack.push(seqEntry);
if (_scriptStack.size() >= 5)
error("script stack overflow");
}