[Scummvm-git-logs] scummvm master -> 631ed435010251b54dd70c1c7c7fa2161e97ed48

[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:
631ed43501 TITANIC: Don't treat Pellerator remote button like Lift button


Commit: 631ed435010251b54dd70c1c7c7fa2161e97ed48
    https://github.com/scummvm/scummvm/commit/631ed435010251b54dd70c1c7c7fa2161e97ed48
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T18:19:46-05:00

Commit Message:
TITANIC: Don't treat Pellerator remote button like Lift button

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



diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index a33f116..f7354ea 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -59,22 +59,22 @@ bool CBasicRemoteGlyph::setup(CPetControl *petControl, CPetGlyphs *owner) {
 	CPetRemoteGlyph::setup(petControl, owner);
 	setDefaults(_gfxName, petControl);
 	if (owner)
-		_gfxElement = getElement(18);
+		_callButton = getElement(18);
 	return true;
 }
 
 void CBasicRemoteGlyph::draw2(CScreenManager *screenManager) {
-	if (_gfxElement)
-		_gfxElement->draw(screenManager);
+	if (_callButton)
+		_callButton->draw(screenManager);
 }
 
 bool CBasicRemoteGlyph::MouseButtonDownMsg(const Point &pt) {
-	return _gfxElement && _gfxElement->MouseButtonDownMsg(pt);
+	return _callButton && _callButton->MouseButtonDownMsg(pt);
 }
 
 bool CBasicRemoteGlyph::MouseButtonUpMsg(const Point &pt) {
-	if (_gfxElement && _gfxElement->MouseButtonUpMsg(pt)) {
-		getOwner()->generateMessage(RMSG_ACTIVATE, "Lift");
+	if (_callButton && _callButton->MouseButtonUpMsg(pt)) {
+		getOwner()->generateMessage(RMSG_ACTIVATE, _msgString);
 		return true;
 	}
 
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index 341f13e..83b6e16 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -65,9 +65,9 @@ public:
 
 class CPetRemoteGlyph : public CPetGlyph {
 protected:
-	CPetGfxElement *_gfxElement;
+	CPetGfxElement *_callButton;
 protected:
-	CPetRemoteGlyph() : CPetGlyph(), _gfxElement(nullptr) {}
+	CPetRemoteGlyph() : CPetGlyph(), _callButton(nullptr) {}
 
 	/**
 	 * Set defaults for the glyph