aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-23 11:29:26 -0400
committerPaul Gilbert2016-07-10 16:11:48 -0400
commit631d979fb3c213a2de8bf32a72236ab76e3ad1d8 (patch)
tree20bba34b4dd583703bf4e1295e4826d1705594b8 /engines/titanic
parent58e1a807f3c7c9e0342ef1edd964d6d13de57dc3 (diff)
downloadscummvm-rg350-631d979fb3c213a2de8bf32a72236ab76e3ad1d8.tar.gz
scummvm-rg350-631d979fb3c213a2de8bf32a72236ab76e3ad1d8.tar.bz2
scummvm-rg350-631d979fb3c213a2de8bf32a72236ab76e3ad1d8.zip
TITANIC: Fix mouse presses on PET glyphs
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/pet_control/pet_glyphs.cpp11
-rw-r--r--engines/titanic/pet_control/pet_quit.cpp6
2 files changed, 9 insertions, 8 deletions
diff --git a/engines/titanic/pet_control/pet_glyphs.cpp b/engines/titanic/pet_control/pet_glyphs.cpp
index 7144378548..632c8a38a1 100644
--- a/engines/titanic/pet_control/pet_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_glyphs.cpp
@@ -308,14 +308,15 @@ bool CPetGlyphs::mouseButtonDown(const Point &pt) {
int index = getItemIndex(idx);
CPetGlyph *glyph = getGlyph(index);
if (glyph) {
- if (glyph->checkHighlight(pt))
- return true;
-
- if (!(_field20 & 2)) {
+ if (_highlightIndex == index) {
+ glyph->proc28(glyphRect);
+ glyph->proc14();
+ } else {
changeHighlight(index);
makePetDirty();
- return true;
}
+
+ return true;
}
}
}
diff --git a/engines/titanic/pet_control/pet_quit.cpp b/engines/titanic/pet_control/pet_quit.cpp
index be7257f209..2f515a3235 100644
--- a/engines/titanic/pet_control/pet_quit.cpp
+++ b/engines/titanic/pet_control/pet_quit.cpp
@@ -37,9 +37,9 @@ bool CPetQuit::setup(CPetControl *petControl, CPetGlyphs *owner) {
_text.setHasBorder(true);
_text.setup();
- Rect elementRect(0, 0, 496, 388);
- elementRect.moveTo(496, 388);
- _element.setBounds(elementRect);
+ Rect btnRect(0, 0, 496, 388);
+ btnRect.moveTo(496, 388);
+ _btnYes.setBounds(btnRect);
return true;
}