[Scummvm-cvs-logs] SF.net SVN: scummvm: [26223] scummvm/trunk/engines/saga

[fingolfin at users.sourceforge.net]

Revision: 26223
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26223&view=rev
Author:   fingolfin
Date:     2007-03-18 11:45:36 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
SAGA: Make use of EventManager::getMousePos

Modified Paths:
--------------
    scummvm/trunk/engines/saga/input.cpp
    scummvm/trunk/engines/saga/saga.h

Modified: scummvm/trunk/engines/saga/input.cpp
===================================================================
--- scummvm/trunk/engines/saga/input.cpp	2007-03-18 18:34:16 UTC (rev 26222)
+++ scummvm/trunk/engines/saga/input.cpp	2007-03-18 18:45:36 UTC (rev 26223)
@@ -40,8 +40,6 @@
 int SagaEngine::processInput() {
 	Common::Event event;
 
-//	Point imousePt;
-
 	Common::EventManager *eventMan = _system->getEventManager();
 	while (eventMan->pollEvent(event)) {
 		switch (event.type) {
@@ -129,22 +127,19 @@
 			break;
 		case Common::EVENT_LBUTTONDOWN:
 			_leftMouseButtonPressed = true;
-			_mousePos = event.mouse;
-			_interface->update(_mousePos, UPDATE_LEFTBUTTONCLICK);
+			_interface->update(event.mouse, UPDATE_LEFTBUTTONCLICK);
 			break;
 		case Common::EVENT_RBUTTONDOWN:
 			_rightMouseButtonPressed = true;
-			_mousePos = event.mouse;
-			_interface->update(_mousePos, UPDATE_RIGHTBUTTONCLICK);
+			_interface->update(event.mouse, UPDATE_RIGHTBUTTONCLICK);
 			break;
 		case Common::EVENT_WHEELUP:
-			_interface->update(_mousePos, UPDATE_WHEELUP);
+			_interface->update(event.mouse, UPDATE_WHEELUP);
 			break;
 		case Common::EVENT_WHEELDOWN:
-			_interface->update(_mousePos, UPDATE_WHEELDOWN);
+			_interface->update(event.mouse, UPDATE_WHEELDOWN);
 			break;
 		case Common::EVENT_MOUSEMOVE:
-			_mousePos = event.mouse;
 			break;
 		case Common::EVENT_QUIT:
 			shutDown();
@@ -157,6 +152,9 @@
 	return SUCCESS;
 }
 
+Point SagaEngine::mousePos() const {
+	return _system->getEventManager()->getMousePos();
+}
 
 } // End of namespace Saga
 

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2007-03-18 18:34:16 UTC (rev 26222)
+++ scummvm/trunk/engines/saga/saga.h	2007-03-18 18:45:36 UTC (rev 26223)
@@ -331,9 +331,7 @@
 	const char *getObjectName(uint16 objectId);
 public:
 	int processInput(void);
-	const Point &mousePos() const {
-		return _mousePos;
-	}
+	Point mousePos() const;
 
 	const bool leftMouseButtonPressed() const {
 		return _leftMouseButtonPressed;
@@ -354,7 +352,6 @@
 	bool _saveMarks[MAX_SAVES];
 	SaveGameHeader _saveHeader;
 
-	Point _mousePos;
 	bool _leftMouseButtonPressed;
 	bool _rightMouseButtonPressed;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.