[Scummvm-git-logs] scummvm master -> 8cc125c2f7658efed056b78fcb600f1ebb316bdd
dreammaster
dreammaster at scummvm.org
Thu Nov 17 02:16:13 CET 2016
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:
8cc125c2f7 TITANIC: Fix opening & closing washstand
Commit: 8cc125c2f7658efed056b78fcb600f1ebb316bdd
https://github.com/scummvm/scummvm/commit/8cc125c2f7658efed056b78fcb600f1ebb316bdd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-16T20:16:07-05:00
Commit Message:
TITANIC: Fix opening & closing washstand
Changed paths:
engines/titanic/game/sgt/washstand.cpp
diff --git a/engines/titanic/game/sgt/washstand.cpp b/engines/titanic/game/sgt/washstand.cpp
index 16c78cd..5be722b 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;
More information about the Scummvm-git-logs
mailing list