[Scummvm-cvs-logs] SF.net SVN: scummvm:[49413] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 49413
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49413&view=rev
Author:   thebluegr
Date:     2010-06-03 21:52:21 +0000 (Thu, 03 Jun 2010)

Log Message:
-----------
Re-enabled the cursor position limiting code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kevent.cpp
    scummvm/trunk/engines/sci/event.cpp

Modified: scummvm/trunk/engines/sci/engine/kevent.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.cpp	2010-06-03 21:13:08 UTC (rev 49412)
+++ scummvm/trunk/engines/sci/engine/kevent.cpp	2010-06-03 21:52:21 UTC (rev 49413)
@@ -49,6 +49,8 @@
 	SegManager *segMan = s->_segMan;
 	Common::Point mousePos;
 
+	// Limit the mouse cursor position, if necessary
+	g_sci->_gfxCursor->refreshPosition();
 	mousePos = g_sci->_gfxCursor->getPosition();
 
 	// If there's a simkey pending, and the game wants a keyboard event, use the

Modified: scummvm/trunk/engines/sci/event.cpp
===================================================================
--- scummvm/trunk/engines/sci/event.cpp	2010-06-03 21:13:08 UTC (rev 49412)
+++ scummvm/trunk/engines/sci/event.cpp	2010-06-03 21:52:21 UTC (rev 49413)
@@ -319,8 +319,6 @@
 	//sci_event_t error_event = { SCI_EVT_ERROR, 0, 0, 0 };
 	sciEvent event = { 0, 0, 0, 0 };
 
-	// TODO: we need to call Cursor::refreshPosition() before each screen update to limit the mouse cursor position
-
 	// Update the screen here, since it's called very often
 	g_system->updateScreen();
 
@@ -389,7 +387,6 @@
 	while (true) {
 		// let backend process events and update the screen
 		get(SCI_EVENT_PEEK);
-		// TODO: we need to call Cursor::refreshPosition() before each screen update to limit the mouse cursor position
 		time = g_system->getMillis();
 		if (time + 10 < wakeup_time) {
 			g_system->delayMillis(10);


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