[Scummvm-cvs-logs] SF.net SVN: scummvm:[49542] scummvm/trunk/engines/sci/graphics/cursor.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Jun 9 16:16:00 CEST 2010


Revision: 49542
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49542&view=rev
Author:   thebluegr
Date:     2010-06-09 14:16:00 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
Disabled the mouse warping code, as it can be annoying in windowed mode

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/cursor.cpp

Modified: scummvm/trunk/engines/sci/graphics/cursor.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/cursor.cpp	2010-06-09 14:15:51 UTC (rev 49541)
+++ scummvm/trunk/engines/sci/graphics/cursor.cpp	2010-06-09 14:16:00 UTC (rev 49542)
@@ -258,12 +258,16 @@
 }
 
 void GfxCursor::setPosition(Common::Point pos) {
+	// This code has been disabled because it's annoying in windowed mode. The engine shouldn't move
+	// the mouse cursor whenever it wants, it interferes with other programs
+#if 0
 	if (!_upscaledHires) {
 		g_system->warpMouse(pos.x, pos.y);
 	} else {
 		_screen->adjustToUpscaledCoordinates(pos.y, pos.x);
 		g_system->warpMouse(pos.x, pos.y);
 	}
+#endif
 }
 
 Common::Point GfxCursor::getPosition() {
@@ -289,6 +293,9 @@
 }
 
 void GfxCursor::refreshPosition() {
+	// This code has been disabled because it's annoying in windowed mode. The engine shouldn't move
+	// the mouse cursor whenever it wants, it interferes with other programs
+#if 0
 	bool clipped = false;
 	Common::Point mousePoint = getPosition();
 
@@ -311,6 +318,7 @@
 	// FIXME: Do this only when mouse is grabbed?
 	if (clipped)
 		setPosition(mousePoint);
+#endif
 }
 
 void GfxCursor::kernelSetMoveZone(Common::Rect zone) {


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




More information about the Scummvm-git-logs mailing list