[Scummvm-cvs-logs] scummvm master -> 4b8d0c59167bb59bbc21868edd4d5a361e3e2907

Strangerke Strangerke at scummvm.org
Mon Mar 24 18:18:37 CET 2014


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:
4b8d0c5916 VOYEUR: Remove useless usage of pointer in EventManager


Commit: 4b8d0c59167bb59bbc21868edd4d5a361e3e2907
    https://github.com/scummvm/scummvm/commit/4b8d0c59167bb59bbc21868edd4d5a361e3e2907
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-24T18:17:54+01:00

Commit Message:
VOYEUR: Remove useless usage of pointer in EventManager

Changed paths:
    engines/voyeur/events.cpp



diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 03ea4d3..9a3c6d0 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -266,18 +266,18 @@ void EventsManager::pollEvents() {
 			}
 			return;
 		case Common::EVENT_LBUTTONDOWN:
-			_vm->_eventsManager->_newLeftClick = true;
-			_vm->_eventsManager->_newMouseClicked = true;
+			_newLeftClick = true;
+			_newMouseClicked = true;
 			return;
 		case Common::EVENT_RBUTTONDOWN:
-			_vm->_eventsManager->_newRightClick = true;
-			_vm->_eventsManager->_newMouseClicked = true;
+			_newRightClick = true;
+			_newMouseClicked = true;
 			return;
 		case Common::EVENT_LBUTTONUP:
 		case Common::EVENT_RBUTTONUP:
-			_vm->_eventsManager->_newMouseClicked = false;
-			_vm->_eventsManager->_newLeftClick = false;
-			_vm->_eventsManager->_newRightClick = false;
+			_newMouseClicked = false;
+			_newLeftClick = false;
+			_newRightClick = false;
 			return;
 		case Common::EVENT_MOUSEMOVE:
 			_mousePos = event.mouse;
@@ -574,13 +574,13 @@ void EventsManager::getMouseInfo() {
 		}
 	}
 
-	_vm->_eventsManager->_mouseClicked = _vm->_eventsManager->_newMouseClicked;
-	_vm->_eventsManager->_leftClick = _vm->_eventsManager->_newLeftClick;
-	_vm->_eventsManager->_rightClick = _vm->_eventsManager->_newRightClick;
+	_mouseClicked = _newMouseClicked;
+	_leftClick = _newLeftClick;
+	_rightClick = _newRightClick;
 
-	_vm->_eventsManager->_newMouseClicked = false;
-	_vm->_eventsManager->_newLeftClick = false;
-	_vm->_eventsManager->_newRightClick = false;
+	_newMouseClicked = false;
+	_newLeftClick = false;
+	_newRightClick = false;
 }
 
 void EventsManager::startCursorBlink() {






More information about the Scummvm-git-logs mailing list