aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.h
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-08 20:49:00 -0400
committerPaul Gilbert2015-07-08 20:49:00 -0400
commit6b3df0d9669d83eebd94976a9b995620e75445be (patch)
tree2a4932a1e7eb994d62659be2b891ec8d14abb731 /engines/sherlock/objects.h
parentda562308cf534949aa2fbde65cab72e9a5958222 (diff)
downloadscummvm-rg350-6b3df0d9669d83eebd94976a9b995620e75445be.tar.gz
scummvm-rg350-6b3df0d9669d83eebd94976a9b995620e75445be.tar.bz2
scummvm-rg350-6b3df0d9669d83eebd94976a9b995620e75445be.zip
SHERLOCK: RT: Implement handling of 2nd object requiredFlag
Diffstat (limited to 'engines/sherlock/objects.h')
-rw-r--r--engines/sherlock/objects.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h
index ef62ff9d26..8cfb466255 100644
--- a/engines/sherlock/objects.h
+++ b/engines/sherlock/objects.h
@@ -218,7 +218,7 @@ public:
Point32 _goto; // Walk destination
int _lookFlag; // Which flag LOOK will set (if any)
- int _requiredFlag; // Object will be hidden if not set
+ int _requiredFlag[2]; // Object will be hidden if not set
Common::Point _noShapeSize; // Size of a NO_SHAPE
int _status; // Status (open/closed, moved/not)
int8 _misc; // Misc field -- use varies with type
@@ -237,7 +237,6 @@ public:
UseType _use[6]; // Serrated Scalpel uses 4, Rose Tattoo 6
int _quickDraw; // Flag telling whether to use quick draw routine or not
int _scaleVal; // Tells how to scale the sprite
- int _requiredFlags1; // This flag must also be set, or the sprite is hidden
int _gotoSeq; // Used by Talk to tell which sequence to goto when able
int _talkSeq; // Tells which talk sequence currently in use (Talk or Listen)
int _restoreSlot; // Used when talk returns to the previous sequence