diff options
author | Paul Gilbert | 2015-07-05 21:28:26 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-07-05 21:28:26 -0400 |
commit | b935cb1656cd159073021c85f5853f4d577977fb (patch) | |
tree | 3c639a041a0bd3be0ef4587da8e3bf7bd5197d87 /engines/sherlock/tattoo | |
parent | 8570f052a39eb6ba4efe3764eb152076fbcd2f76 (diff) | |
download | scummvm-rg350-b935cb1656cd159073021c85f5853f4d577977fb.tar.gz scummvm-rg350-b935cb1656cd159073021c85f5853f4d577977fb.tar.bz2 scummvm-rg350-b935cb1656cd159073021c85f5853f4d577977fb.zip |
SHERLOCK: RT: Fix People::reset when _scriptMoreFlag is set
Diffstat (limited to 'engines/sherlock/tattoo')
-rw-r--r-- | engines/sherlock/tattoo/tattoo_talk.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp index 51704e7023..3cfb2ea2b4 100644 --- a/engines/sherlock/tattoo/tattoo_talk.cpp +++ b/engines/sherlock/tattoo/tattoo_talk.cpp @@ -22,6 +22,7 @@ #include "sherlock/tattoo/tattoo_talk.h" #include "sherlock/tattoo/tattoo_people.h" +#include "sherlock/tattoo/tattoo_scene.h" #include "sherlock/tattoo/tattoo_user_interface.h" #include "sherlock/sherlock.h" #include "sherlock/screen.h" @@ -267,7 +268,7 @@ OpcodeReturn TattooTalk::cmdGotoScene(const byte *&str) { Scene &scene = *_vm->_scene; scene._goToScene = str[1] - 1; - if (scene._goToScene != 100) { + if (scene._goToScene != OVERHEAD_MAP) { // Not going to the map overview map._oldCharPoint = scene._goToScene; @@ -283,10 +284,10 @@ OpcodeReturn TattooTalk::cmdGotoScene(const byte *&str) { } _scriptMoreFlag = 1; - } // if (scene._goToScene != 100) + } str += 7; - if (scene._goToScene != 100) + if (scene._goToScene != OVERHEAD_MAP) _scriptSaveIndex = str - _scriptStart; _endStr = true; |