From 631d979fb3c213a2de8bf32a72236ab76e3ad1d8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 23 Apr 2016 11:29:26 -0400
Subject: TITANIC: Fix mouse presses on PET glyphs

---
 engines/titanic/pet_control/pet_glyphs.cpp | 11 ++++++-----
 engines/titanic/pet_control/pet_quit.cpp   |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'engines')

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;
 }
-- 
cgit v1.2.3