[Scummvm-cvs-logs] SF.net SVN: scummvm: [26222] scummvm/trunk/engines/cine

[fingolfin at users.sourceforge.net]

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

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

Modified Paths:
--------------
    scummvm/trunk/engines/cine/main_loop.cpp
    scummvm/trunk/engines/cine/various.h

Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp	2007-03-18 18:27:52 UTC (rev 26221)
+++ scummvm/trunk/engines/cine/main_loop.cpp	2007-03-18 18:34:16 UTC (rev 26222)
@@ -35,6 +35,11 @@
 
 namespace Cine {
 
+struct mouseStatusStruct {
+	int left;
+	int right;
+};
+
 mouseStatusStruct mouseData;
 
 uint16 mouseRight = 0;
@@ -58,8 +63,6 @@
 			mouseRight = 1;
 			break;
 		case Common::EVENT_MOUSEMOVE:
-			mouseData.X = event.mouse.x;
-			mouseData.Y = event.mouse.y;
 			break;
 		case Common::EVENT_QUIT:
 			g_system->quit();
@@ -158,8 +161,9 @@
 }
 
 void getMouseData(uint16 param, uint16 *pButton, uint16 *pX, uint16 *pY) {
-	*pX = mouseData.X;
-	*pY = mouseData.Y;
+	Common::Point mouse = g_system->getEventManager()->getMousePos();
+	*pX = mouse.x;
+	*pY = mouse.y;
 
 	*pButton = 0;
 

Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h	2007-03-18 18:27:52 UTC (rev 26221)
+++ scummvm/trunk/engines/cine/various.h	2007-03-18 18:34:16 UTC (rev 26222)
@@ -172,13 +172,6 @@
 
 void blitScreen(byte *frontBuffer, byte *backbuffer);
 
-struct mouseStatusStruct {
-	int left;
-	int right;
-	int X;
-	int Y;
-};
-
 extern int16 additionalBgVScroll;
 
 void addSeqListElement(int16 param0, int16 param1, int16 param2, int16 param3, int16 param4, int16 param5, int16 param6, int16 param7, int16 param8);


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