[Scummvm-git-logs] scummvm master -> f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7

[dreammaster]

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:
f2d68dc146 TITANIC: Fix operation of 1st class light switches


Commit: f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7
    https://github.com/scummvm/scummvm/commit/f2d68dc14671715a28ba05b7b78e7cb9d4c8afc7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-17T15:41:18-05:00

Commit Message:
TITANIC: Fix operation of 1st class light switches

Changed paths:
    engines/titanic/pet_control/pet_remote.cpp
    engines/titanic/pet_control/pet_remote_glyphs.cpp


diff --git a/engines/titanic/pet_control/pet_remote.cpp b/engines/titanic/pet_control/pet_remote.cpp
index 9123959..3f00ce5 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 a9c471a..f0e71d3 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;