diff options
| author | Paul Gilbert | 2015-05-24 22:33:41 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-24 22:33:41 -0400 |
| commit | 8331fa886f4fa9031de17652632b3a12e1f84f06 (patch) | |
| tree | 56000f76b95b6aef86e9d4e0341bf9d6d9ea5fdd /engines/sherlock/talk.cpp | |
| parent | 1f9f01c5714930e96eb7713c74fe826fe85d1457 (diff) | |
| download | scummvm-rg350-8331fa886f4fa9031de17652632b3a12e1f84f06.tar.gz scummvm-rg350-8331fa886f4fa9031de17652632b3a12e1f84f06.tar.bz2 scummvm-rg350-8331fa886f4fa9031de17652632b3a12e1f84f06.zip | |
SHERLOCK: Fix People data initialization and general start fixes
Diffstat (limited to 'engines/sherlock/talk.cpp')
| -rw-r--r-- | engines/sherlock/talk.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index 22e77fb869..e3f8c7b8dd 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -1577,12 +1577,20 @@ OpcodeReturn Talk::cmdGotoScene(const byte *&str) { } OpcodeReturn Talk::cmdHolmesOff(const byte *&str) { - _vm->_people->_holmesOn = false; + People &people = *_vm->_people; + people._holmesOn = false; + if (IS_ROSE_TATTOO) + people[PLAYER]._type = REMOVE; + return RET_SUCCESS; } OpcodeReturn Talk::cmdHolmesOn(const byte *&str) { - _vm->_people->_holmesOn = true; + People &people = *_vm->_people; + people._holmesOn = true; + if (IS_ROSE_TATTOO) + people[PLAYER]._type = CHARACTER; + return RET_SUCCESS; } |