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

[thebluegr at users.sourceforge.net]

Revision: 42060
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42060&view=rev
Author:   thebluegr
Date:     2009-07-03 14:18:20 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
Replaced all calls for manipulating the mouse cursor to be made to the CursorManager instead of directly to the graphics backend

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/gfx/gfx_driver.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-07-03 13:46:47 UTC (rev 42059)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-07-03 14:18:20 UTC (rev 42060)
@@ -25,6 +25,7 @@
 
 #include "common/system.h"
 #include "common/events.h"
+#include "graphics/cursorman.h"
 
 #include "sci/sci.h"
 #include "sci/debug.h"	// for g_debug_sleeptime_factor
@@ -306,14 +307,14 @@
 		if (s->_version < SCI_VERSION_1_1) {
 			if (argv[0].toSint16() <= 1) {
 				// Newer (SCI1.1) semantics: show/hide cursor
-				g_system->showMouse(argv[0].toSint16() != 0);
+				CursorMan.showMouse(argv[0].toSint16() != 0);
 			} else {
 				// Pre-SCI1.1: set cursor according to the first parameter
 				GFX_ASSERT(gfxop_set_pointer_cursor(s->gfx_state, argv[0].toSint16()));
 			}
 		} else {
 			// SCI1.1: Show/hide cursor
-			g_system->showMouse(argv[0].toSint16() != 0);
+			CursorMan.showMouse(argv[0].toSint16() != 0);
 		}
 		break;
 	case 2 :

Modified: scummvm/trunk/engines/sci/gfx/gfx_driver.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_driver.cpp	2009-07-03 13:46:47 UTC (rev 42059)
+++ scummvm/trunk/engines/sci/gfx/gfx_driver.cpp	2009-07-03 14:18:20 UTC (rev 42060)
@@ -25,6 +25,7 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
+#include "graphics/cursorman.h"
 #include "graphics/primitives.h"
 
 #include "sci/sci.h"
@@ -252,7 +253,7 @@
 
 int GfxDriver::setPointer(gfx_pixmap_t *pointer, Common::Point *hotspot) {
 	if ((pointer == NULL) || (hotspot == NULL)) {
-		g_system->showMouse(false);
+		CursorMan.showMouse(false);
 	} else {
 		byte *cursorData = createCursor(pointer);
 
@@ -266,8 +267,8 @@
 		if (!pointer->palette)
 			color_key = 63;
 
-		g_system->setMouseCursor(cursorData, pointer->width, pointer->height, hotspot->x, hotspot->y, color_key);
-		g_system->showMouse(true);
+		CursorMan.replaceCursor(cursorData, pointer->width, pointer->height, hotspot->x, hotspot->y, color_key);
+		CursorMan.showMouse(true);
 
 		delete[] cursorData;
 		cursorData = 0;


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