diff options
| author | Paul Gilbert | 2015-04-14 21:24:24 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-04-14 21:24:24 -0500 |
| commit | 460a84e68f4a633b52a8654f93cdd81a2f3521e4 (patch) | |
| tree | 76ad2b4fc8e4977dfe58eca57f85c2d2b6b4b5f3 /engines | |
| parent | b14debc20769c7c6e8b0d5fb1d189e319e5ad6e4 (diff) | |
| download | scummvm-rg350-460a84e68f4a633b52a8654f93cdd81a2f3521e4.tar.gz scummvm-rg350-460a84e68f4a633b52a8654f93cdd81a2f3521e4.tar.bz2 scummvm-rg350-460a84e68f4a633b52a8654f93cdd81a2f3521e4.zip | |
SHERLOCK: Fix stopping Watson from moving when talking to him
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/people.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/talk.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp index 5dd50e7e94..cc26339bde 100644 --- a/engines/sherlock/people.cpp +++ b/engines/sherlock/people.cpp @@ -597,7 +597,7 @@ int People::findSpeaker(int speaker) { if (scumm_stricmp(PORTRAITS[speaker], name.c_str()) == 0 && obj._name[4] >= '0' && obj._name[4] <= '9') - return idx - 1; + return idx; } } diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 73bf9b5fb3..ef64edd66b 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -880,7 +880,7 @@ void Talk::clearSequences() { void Talk::pullSequence() { Scene &scene = *_vm->_scene; - if (_scriptStack.empty()) + if (_sequenceStack.empty()) return; SequenceEntry seq = _sequenceStack.pop(); |