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

SHERLOCK: Fix stopping Watson from moving when talking to him

Browse source
This commit is contained in:
Paul Gilbert 2015-04-14 21:24:24 -05:00
parent b14debc207
commit 460a84e68f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sherlock/people.cpp
View file

@ -597,7 +597,7 @@ int People::findSpeaker(int speaker) {
if (scumm_stricmp(PORTRAITS[speaker], name.c_str()) == 0 if (scumm_stricmp(PORTRAITS[speaker], name.c_str()) == 0
&& obj._name[4] >= '0' && obj._name[4] <= '9') && obj._name[4] >= '0' && obj._name[4] <= '9')
return idx - 1; return idx;
} }
} }

2
engines/sherlock/talk.cpp
View file

@ -880,7 +880,7 @@ void Talk::clearSequences() {
void Talk::pullSequence() { void Talk::pullSequence() {
Scene &scene = *_vm->_scene; Scene &scene = *_vm->_scene;
if (_scriptStack.empty()) if (_sequenceStack.empty())
return; return;
SequenceEntry seq = _sequenceStack.pop(); SequenceEntry seq = _sequenceStack.pop();