aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-16 20:16:07 -0500
committerPaul Gilbert2016-11-16 20:16:07 -0500
commit8cc125c2f7658efed056b78fcb600f1ebb316bdd (patch)
tree426a2f9b6334f481f4585c71c6f3fa9a3a5ca2e8
parent4e3a9b25ea249e6cd2efc9717dcfaaa5e58df4f7 (diff)
downloadscummvm-rg350-8cc125c2f7658efed056b78fcb600f1ebb316bdd.tar.gz
scummvm-rg350-8cc125c2f7658efed056b78fcb600f1ebb316bdd.tar.bz2
scummvm-rg350-8cc125c2f7658efed056b78fcb600f1ebb316bdd.zip
TITANIC: Fix opening & closing washstand
-rw-r--r--engines/titanic/game/sgt/washstand.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/game/sgt/washstand.cpp b/engines/titanic/game/sgt/washstand.cpp
index 16c78cdb90..5be722bec4 100644
--- a/engines/titanic/game/sgt/washstand.cpp
+++ b/engines/titanic/game/sgt/washstand.cpp
@@ -41,7 +41,7 @@ void CWashstand::load(SimpleFile *file) {
}
bool CWashstand::TurnOn(CTurnOn *msg) {
- if (_statics->_washstand == "Closed" && _statics->_bedfoot == "NotOnWashstand") {
+ if (_statics->_washstand == "Closed" && _statics->_bedfoot != "NotOnWashstand") {
setVisible(true);
_statics->_washstand = "Open";
_isClosed = false;
@@ -55,8 +55,8 @@ bool CWashstand::TurnOn(CTurnOn *msg) {
}
bool CWashstand::TurnOff(CTurnOff *msg) {
- if (_statics->_washstand == "Open" && _statics->_desk == "Closed"
- && _statics->_toilet == "Closed" && _statics->_bedfoot == "Open") {
+ if (_statics->_washstand == "Open" && _statics->_basin == "Closed"
+ && _statics->_toilet == "Closed" && _statics->_bedfoot != "Open") {
_statics->_washstand = "Closed";
_isClosed = true;
_startFrame = 14;