aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-16 20:35:11 -0500
committerPaul Gilbert2016-11-16 20:35:11 -0500
commit391eecb98b3c5355d4feae9f4a199f50a6bca768 (patch)
treeb11f681813412a64c05d17c8ef26b95cfec40664 /engines/titanic
parent8cc125c2f7658efed056b78fcb600f1ebb316bdd (diff)
downloadscummvm-rg350-391eecb98b3c5355d4feae9f4a199f50a6bca768.tar.gz
scummvm-rg350-391eecb98b3c5355d4feae9f4a199f50a6bca768.tar.bz2
scummvm-rg350-391eecb98b3c5355d4feae9f4a199f50a6bca768.zip
TITANIC: Fix opening/closing desk and drawers
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/game/sgt/chest_of_drawers.cpp2
-rw-r--r--engines/titanic/game/sgt/desk.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/game/sgt/chest_of_drawers.cpp b/engines/titanic/game/sgt/chest_of_drawers.cpp
index 4f8b332c92..59479c124c 100644
--- a/engines/titanic/game/sgt/chest_of_drawers.cpp
+++ b/engines/titanic/game/sgt/chest_of_drawers.cpp
@@ -53,7 +53,7 @@ bool CChestOfDrawers::TurnOn(CTurnOn *msg) {
}
bool CChestOfDrawers::TurnOff(CTurnOff *msg) {
- if (_statics->_chestOfDrawers == "Open" && _statics->_desk == "Closed") {
+ if (_statics->_chestOfDrawers == "Open" && _statics->_drawer == "Closed") {
CVisibleMsg visibleMsg;
visibleMsg.execute("Drawer");
_statics->_chestOfDrawers = "Closed";
diff --git a/engines/titanic/game/sgt/desk.cpp b/engines/titanic/game/sgt/desk.cpp
index 7f4c602d66..a31efe9e5d 100644
--- a/engines/titanic/game/sgt/desk.cpp
+++ b/engines/titanic/game/sgt/desk.cpp
@@ -56,7 +56,7 @@ bool CDesk::TurnOn(CTurnOn *msg) {
bool CDesk::TurnOff(CTurnOff *msg) {
if (_statics->_desk == "Open" && _statics->_chestOfDrawers == "Closed"
- && _statics->_bedhead == "Open") {
+ && _statics->_bedhead != "Open") {
CVisibleMsg visibleMsg(false);
visibleMsg.execute("ChestOfDrawers");