[Scummvm-git-logs] scummvm master -> cb96b15ee6453c4d3932072d2d15ca12625b1b47
dreammaster
dreammaster at scummvm.org
Mon Jan 16 18:12:00 CET 2017
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:
cb96b15ee6 TITANIC: Workaround for broken light in 1st class suite
Commit: cb96b15ee6453c4d3932072d2d15ca12625b1b47
https://github.com/scummvm/scummvm/commit/cb96b15ee6453c4d3932072d2d15ca12625b1b47
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-16T12:11:51-05:00
Commit Message:
TITANIC: Workaround for broken light in 1st class suite
Changed paths:
engines/titanic/game/light.cpp
diff --git a/engines/titanic/game/light.cpp b/engines/titanic/game/light.cpp
index 3e52a4c..30fc534 100644
--- a/engines/titanic/game/light.cpp
+++ b/engines/titanic/game/light.cpp
@@ -76,8 +76,15 @@ bool CLight::TurnOff(CTurnOff *msg) {
}
bool CLight::LightsMsg(CLightsMsg *msg) {
- if ((msg->_topLeft && _topLeft) || (msg->_bottomLeft && _bottomLeft)
- || (msg->_topRight && _topRight) || (msg->_bottomRight && _bottomRight)) {
+ // WORKAROUND: Since solving the puzzle to get Titania's eye explicitly
+ // requires referring to the "broken light", don't allow the top left
+ // light to be turned on in the player's stateroom until it's gotten/fixed
+ if (msg->_topLeft && _topLeft) {
+ bool showFlag = !getPetControl()->isFirstClassSuite() ||
+ getRoom()->findByName("Eye1") == nullptr;
+ setVisible(showFlag);
+ } else if ((msg->_bottomLeft && _bottomLeft) || (msg->_topRight && _topRight) ||
+ (msg->_bottomRight && _bottomRight)) {
setVisible(true);
} else {
setVisible(false);
More information about the Scummvm-git-logs
mailing list