aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/talk.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-25 11:04:34 -0400
committerPaul Gilbert2015-05-25 11:04:34 -0400
commit1a1010f0ab4164bb615283f9c332afbf97f702ca (patch)
treec50b376386cd3974f85a14d5a3a6819c82ac0cb3 /engines/sherlock/talk.cpp
parentbcb8c02ba178b79b8352bb58f38f429f7f39928c (diff)
downloadscummvm-rg350-1a1010f0ab4164bb615283f9c332afbf97f702ca.tar.gz
scummvm-rg350-1a1010f0ab4164bb615283f9c332afbf97f702ca.tar.bz2
scummvm-rg350-1a1010f0ab4164bb615283f9c332afbf97f702ca.zip
SHERLOCK: Cleanup of checkBgShapes and updateBackground
Diffstat (limited to 'engines/sherlock/talk.cpp')
-rw-r--r--engines/sherlock/talk.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index e3f8c7b8dd..b4be5eed8b 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1578,18 +1578,14 @@ OpcodeReturn Talk::cmdGotoScene(const byte *&str) {
OpcodeReturn Talk::cmdHolmesOff(const byte *&str) {
People &people = *_vm->_people;
- people._holmesOn = false;
- if (IS_ROSE_TATTOO)
- people[PLAYER]._type = REMOVE;
+ people[PLAYER]._type = REMOVE;
return RET_SUCCESS;
}
OpcodeReturn Talk::cmdHolmesOn(const byte *&str) {
People &people = *_vm->_people;
- people._holmesOn = true;
- if (IS_ROSE_TATTOO)
- people[PLAYER]._type = CHARACTER;
+ people[PLAYER]._type = CHARACTER;
return RET_SUCCESS;
}