diff options
| author | Paul Gilbert | 2016-12-17 15:41:18 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-17 15:41:18 -0500 |
| commit | f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7 (patch) | |
| tree | 1a6f25c64e6dd8487bd4c94b66ec6c0a12bb9fdb /engines | |
| parent | fc65fd8474b63c50c3780416f3544e0dd570ac57 (diff) | |
| download | scummvm-rg350-f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7.tar.gz scummvm-rg350-f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7.tar.bz2 scummvm-rg350-f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7.zip | |
TITANIC: Fix operation of 1st class light switches
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/pet_control/pet_remote.cpp | 12 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_remote_glyphs.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/pet_control/pet_remote.cpp b/engines/titanic/pet_control/pet_remote.cpp index 9123959b62..3f00ce5066 100644 --- a/engines/titanic/pet_control/pet_remote.cpp +++ b/engines/titanic/pet_control/pet_remote.cpp @@ -112,12 +112,12 @@ bool CPetRemote::reset() { _up.reset("PetUp", _petControl, MODE_UNSELECTED); _down.reset("PetDown", _petControl, MODE_UNSELECTED); - _left.reset("PetLeftUp", _petControl, MODE_SELECTED); - _left.reset("PetLeft", _petControl, MODE_UNSELECTED); - _right.reset("PetRightUp", _petControl, MODE_SELECTED); - _right.reset("PetRight", _petControl, MODE_UNSELECTED); - _top.reset("PetTopUp", _petControl, MODE_SELECTED); - _top.reset("PetTop", _petControl, MODE_UNSELECTED); + _left.reset("PetLeftUp", _petControl, MODE_UNSELECTED); + _left.reset("PetLeft", _petControl, MODE_SELECTED); + _right.reset("PetRightUp", _petControl, MODE_UNSELECTED); + _right.reset("PetRight", _petControl, MODE_SELECTED); + _top.reset("PetTopUp", _petControl, MODE_UNSELECTED); + _top.reset("PetTop", _petControl, MODE_SELECTED); _bottom.reset("PetBottomUp", _petControl, MODE_UNSELECTED); _bottom.reset("PetBottom", _petControl, MODE_SELECTED); _action.reset("PetActionUp", _petControl, MODE_UNSELECTED); diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp index a9c471a29c..f0e71d31ee 100644 --- a/engines/titanic/pet_control/pet_remote_glyphs.cpp +++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp @@ -328,7 +328,7 @@ bool COperateLightsGlyph::MouseButtonUpMsg(const Point &pt) { getOwner()->generateMessage(RMSG_UP, "Light"); else if (_down && _down->MouseButtonUpMsg(pt)) getOwner()->generateMessage(RMSG_DOWN, "Light"); - else + else if (_activate && _activate->MouseButtonUpMsg(pt)) getOwner()->generateMessage(RMSG_ACTIVATE, "Light"); return true; |