diff options
author | Eugene Sandulenko | 2015-11-27 22:41:59 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2015-11-27 22:41:59 +0100 |
commit | 46dc9a89c3e876e88786b0f20bbcb9cf8acba5bb (patch) | |
tree | 2eb553709ff01cdb3fc9fbeb8d51ba3aaa61e0c1 /engines/mads/phantom/phantom_scenes1.cpp | |
parent | 9033f8db13b117fd8a78142cb244835d99777310 (diff) | |
download | scummvm-rg350-46dc9a89c3e876e88786b0f20bbcb9cf8acba5bb.tar.gz scummvm-rg350-46dc9a89c3e876e88786b0f20bbcb9cf8acba5bb.tar.bz2 scummvm-rg350-46dc9a89c3e876e88786b0f20bbcb9cf8acba5bb.zip |
MADS: Fix warning. Requires consulting with the original
Diffstat (limited to 'engines/mads/phantom/phantom_scenes1.cpp')
-rw-r--r-- | engines/mads/phantom/phantom_scenes1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index 7bc9c179b9..c86d2852c7 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -6220,7 +6220,7 @@ void Scene110::actions() { if (_action.isAction(VERB_WALK_THROUGH, NOUN_RIGHT_DOOR) || _action.isAction(VERB_OPEN, NOUN_RIGHT_DOOR) || _action.isAction(VERB_UNLOCK, NOUN_RIGHT_DOOR) || _action.isAction(VERB_LOCK, NOUN_RIGHT_DOOR)) { - if ((_globals[kCurrentYear] == 1881) || (_globals[kDoneBrieConv203] >= 1) + if (((_globals[kCurrentYear] == 1881) || (_globals[kDoneBrieConv203] >= 1)) && !_action.isAction(VERB_UNLOCK, NOUN_RIGHT_DOOR) && !_action.isAction(VERB_LOCK, NOUN_RIGHT_DOOR)) { switch (_game._trigger) { case (0): |