[Scummvm-git-logs] scummvm master -> 391eecb98b3c5355d4feae9f4a199f50a6bca768

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
391eecb98b TITANIC: Fix opening/closing desk and drawers


Commit: 391eecb98b3c5355d4feae9f4a199f50a6bca768
    https://github.com/scummvm/scummvm/commit/391eecb98b3c5355d4feae9f4a199f50a6bca768
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-16T20:35:11-05:00

Commit Message:
TITANIC: Fix opening/closing desk and drawers

Changed paths:
    engines/titanic/game/sgt/chest_of_drawers.cpp
    engines/titanic/game/sgt/desk.cpp



diff --git a/engines/titanic/game/sgt/chest_of_drawers.cpp b/engines/titanic/game/sgt/chest_of_drawers.cpp
index 4f8b332..59479c1 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 7f4c602..a31efe9 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");