aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control/pet_remote_glyphs.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-07-15 15:48:43 -0400
committerPaul Gilbert2017-07-15 15:48:43 -0400
commitb4c5318e6d48366e23221e9ab1643393c497561e (patch)
tree093c41f10e22aff55de5daa11a7785cb93744dda /engines/titanic/pet_control/pet_remote_glyphs.cpp
parent0f33e8ff8feb70f3b0625dc5c2ed012e9d3924e8 (diff)
downloadscummvm-rg350-b4c5318e6d48366e23221e9ab1643393c497561e.tar.gz
scummvm-rg350-b4c5318e6d48366e23221e9ab1643393c497561e.tar.bz2
scummvm-rg350-b4c5318e6d48366e23221e9ab1643393c497561e.zip
TITANIC: Don't allow starfield to be shown if puzzle was skipped
Diffstat (limited to 'engines/titanic/pet_control/pet_remote_glyphs.cpp')
-rw-r--r--engines/titanic/pet_control/pet_remote_glyphs.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index b56c2f6854..7aae879646 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -545,11 +545,16 @@ bool CNavigationControllerGlyph::MouseButtonUpMsg(const Point &pt) {
if (!_gfxElement->MouseButtonUpMsg(pt))
return false;
+ CPetControl *pet = getPetControl();
+ CStarControl *starControl = pet->getStarControl();
_flag = !_flag;
- CTreeItem *target = getPetControl()->_remoteTarget;
- if (target) {
- CPETHelmetOnOffMsg msg;
- msg.execute(target);
+
+ if (!starControl->isSkipped()) {
+ CTreeItem *target = pet->_remoteTarget;
+ if (target) {
+ CPETHelmetOnOffMsg msg;
+ msg.execute(target);
+ }
}
return true;