From cd4a28fe6e6f5fb2af778a3e6ba48c883ffe9c6e Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 19 Dec 2016 21:21:28 -0500
Subject: TITANIC: Renamings in CInputHandler

---
 engines/titanic/input_handler.cpp | 10 +++++-----
 engines/titanic/input_handler.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines')

diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp
index ba2c08ed89..481224141d 100644
--- a/engines/titanic/input_handler.cpp
+++ b/engines/titanic/input_handler.cpp
@@ -32,7 +32,7 @@ namespace Titanic {
 CInputHandler::CInputHandler(CGameManager *owner) :
 		_gameManager(owner), _inputTranslator(nullptr), _dragging(false),
 		_buttonDown(false), _dragItem(nullptr),  _lockCount(0),
-		_singleton(false) {
+		_abortMessage(false) {
 	CScreenManager::_screenManagerPtr->_inputHandler = this;
 }
 
@@ -59,7 +59,7 @@ void CInputHandler::decLockCount() {
 		}
 
 		_buttonDown = _inputTranslator->isMousePressed();
-		_singleton = true;
+		_abortMessage = true;
 	}
 }
 
@@ -75,11 +75,11 @@ void CInputHandler::handleMessage(CMessage &msg, bool respectLock) {
 
 void CInputHandler::processMessage(CMessage *msg) {
 	const CMouseMsg *mouseMsg = dynamic_cast<const CMouseMsg *>(msg);
-	_singleton = false;
+	_abortMessage = false;
 	dispatchMessage(msg);
 
-	if (_singleton) {
-		_singleton = false;
+	if (_abortMessage) {
+		_abortMessage = false;
 	} else if (mouseMsg) {
 		// Keep the game state mouse position up to date
 		if (_mousePos != mouseMsg->_mousePos) {
diff --git a/engines/titanic/input_handler.h b/engines/titanic/input_handler.h
index d5f29b7921..5f0be04f1a 100644
--- a/engines/titanic/input_handler.h
+++ b/engines/titanic/input_handler.h
@@ -56,7 +56,7 @@ public:
 	Point _dragStartPos;
 	Point _mousePos;
 	int _lockCount;
-	bool _singleton;
+	bool _abortMessage;
 public:
 	CInputHandler(CGameManager *owner);
 	~CInputHandler();
-- 
cgit v1.2.3