aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-11 18:19:46 -0500
committerPaul Gilbert2016-11-11 18:19:46 -0500
commit631ed435010251b54dd70c1c7c7fa2161e97ed48 (patch)
tree6661438797ee04a419b2d3c8788861bcb7a7c748 /engines/titanic/pet_control
parentfcbeb161b364fcc8d0d1bf8f78bd2ae10c8ded13 (diff)
downloadscummvm-rg350-631ed435010251b54dd70c1c7c7fa2161e97ed48.tar.gz
scummvm-rg350-631ed435010251b54dd70c1c7c7fa2161e97ed48.tar.bz2
scummvm-rg350-631ed435010251b54dd70c1c7c7fa2161e97ed48.zip
TITANIC: Don't treat Pellerator remote button like Lift button
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r--engines/titanic/pet_control/pet_remote_glyphs.cpp12
-rw-r--r--engines/titanic/pet_control/pet_remote_glyphs.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index a33f1163c2..f7354eab49 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 341f13e035..83b6e16a4b 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