[Scummvm-git-logs] scummvm master -> cd4a28fe6e6f5fb2af778a3e6ba48c883ffe9c6e

dreammaster dreammaster at scummvm.org
Tue Dec 20 03:21:29 CET 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cd4a28fe6e TITANIC: Renamings in CInputHandler


Commit: cd4a28fe6e6f5fb2af778a3e6ba48c883ffe9c6e
    https://github.com/scummvm/scummvm/commit/cd4a28fe6e6f5fb2af778a3e6ba48c883ffe9c6e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-19T21:21:28-05:00

Commit Message:
TITANIC: Renamings in CInputHandler

Changed paths:
    engines/titanic/input_handler.cpp
    engines/titanic/input_handler.h


diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp
index ba2c08e..4812241 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 d5f29b7..5f0be04 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();





More information about the Scummvm-git-logs mailing list