TITANIC: Clarify MODE_2 as MODE_FOCUSED

3 files changed, 10 insertions, 7 deletions

diff --git a/engines/titanic/pet_control/pet_element.cpp b/engines/titanic/pet_control/pet_element.cpp
index 8727d4f6f4..c5e1a6ea9c 100644
--- a/engines/titanic/pet_control/pet_element.cpp
+++ b/engines/titanic/pet_control/pet_element.cpp
@@ -50,10 +50,10 @@ bool CPetElement::MouseDoubleClickMsg(const Point &pt) const {
 	return _bounds.contains(pt);
 }
 
-int CPetElement::proc9(const Point &pt) {
+bool CPetElement::MouseMoveMsg(const Point &pt) {
 	bool result = _bounds.contains(pt);
 	if (result)
-		setMode(MODE_2);
+		setMode(MODE_FOCUSED);
 	return result;
 }
 
@@ -92,7 +92,7 @@ int CPetElement::getMovieFrame() const {
 }
 
 void CPetElement::setMode(PetElementMode newMode) {
-	if (newMode >= MODE_UNSELECTED && newMode <= MODE_2)
+	if (newMode >= MODE_UNSELECTED && newMode <= MODE_FOCUSED)
 		changeMode(newMode);
 }
 
diff --git a/engines/titanic/pet_control/pet_element.h b/engines/titanic/pet_control/pet_element.h
index ad4e7fe5c8..bbf3e83537 100644
--- a/engines/titanic/pet_control/pet_element.h
+++ b/engines/titanic/pet_control/pet_element.h
@@ -30,7 +30,7 @@
 
 namespace Titanic {
 
-enum PetElementMode { MODE_UNSELECTED = 0, MODE_SELECTED = 1, MODE_2 = 2 };
+enum PetElementMode { MODE_UNSELECTED = 0, MODE_SELECTED = 1, MODE_FOCUSED = 2 };
 
 class CGameObject;
 class CPetControl;
@@ -84,7 +84,10 @@ public:
 	 */
 	virtual bool MouseDoubleClickMsg(const Point &pt) const;
 
-	virtual int proc9(const Point &pt);
+	/**
+	 * Handles processing mouse move messages
+	 */
+	virtual bool MouseMoveMsg(const Point &pt);
 
 	/**
 	 * Returns whether the passed point falls inside the item
diff --git a/engines/titanic/pet_control/pet_gfx_element.cpp b/engines/titanic/pet_control/pet_gfx_element.cpp
index 9fc0c2a57d..6022885770 100644
--- a/engines/titanic/pet_control/pet_gfx_element.cpp
+++ b/engines/titanic/pet_control/pet_gfx_element.cpp
@@ -36,7 +36,7 @@ void CPetGfxElement::setup(PetElementMode mode, const CString &name,
 	case MODE_SELECTED:
 		_object1 = petControl->getHiddenObject(name);
 		break;
-	case MODE_2:
+	case MODE_FOCUSED:
 		_object2 = petControl->getHiddenObject(name);
 		break;
 	default:
@@ -93,7 +93,7 @@ CGameObject *CPetGfxElement::getObject() const {
 		return _object0;
 	case MODE_SELECTED:
 		return _object1;
-	case MODE_2:
+	case MODE_FOCUSED:
 		return _object2;
 	default:
 		return nullptr;