[Scummvm-cvs-logs] SF.net SVN: scummvm:[55611] scummvm/trunk/engines/parallaction/input.cpp

[peres001 at users.sourceforge.net]

Revision: 55611
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55611&view=rev
Author:   peres001
Date:     2011-01-29 10:42:56 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
PARALLACTION: Use CursorMan to control cursor instead of backend functions.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/input.cpp

Modified: scummvm/trunk/engines/parallaction/input.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/input.cpp	2011-01-29 10:42:40 UTC (rev 55610)
+++ scummvm/trunk/engines/parallaction/input.cpp	2011-01-29 10:42:56 UTC (rev 55611)
@@ -25,6 +25,7 @@
 
 #include "common/events.h"
 #include "common/system.h"
+#include "graphics/cursorman.h"
 
 #include "parallaction/exec.h"
 #include "parallaction/input.h"
@@ -444,11 +445,11 @@
 	switch (_mouseState) {
 	case MOUSE_ENABLED_HIDE:
 	case MOUSE_DISABLED:
-		_vm->_system->showMouse(false);
+		CursorMan.showMouse(false);
 		break;
 
 	case MOUSE_ENABLED_SHOW:
-		_vm->_system->showMouse(true);
+		CursorMan.showMouse(true);
 		break;
 	}
 }
@@ -519,14 +520,14 @@
 		// this stuff is needed to avoid artifacts with labels and selected items when switching cursors
 		stopHovering();
 		_activeItem._id = 0;
-		_vm->_system->setMouseCursor(_mouseArrow->getData(0), MOUSEARROW_WIDTH_NS, MOUSEARROW_HEIGHT_NS, 0, 0, 0);
+		CursorMan.replaceCursor(_mouseArrow->getData(0), MOUSEARROW_WIDTH_NS, MOUSEARROW_HEIGHT_NS, 0, 0, 0);
 		break;
 
 	case GType_BRA: {
 		Common::Rect r;
 		_mouseArrow->getRect(0, r);
-		_vm->_system->setMouseCursor(_mouseArrow->getData(0), r.width(), r.height(), 0, 0, 0);
-		_vm->_system->showMouse(true);
+		CursorMan.replaceCursor(_mouseArrow->getData(0), r.width(), r.height(), 0, 0, 0);
+		CursorMan.showMouse(true);
 		_activeItem._id = 0;
 		break;
 	}
@@ -545,7 +546,7 @@
 		byte *v8 = _comboArrow->getData(0);
 		// FIXME: destination offseting is not clear
 		_vm->_inventoryRenderer->drawItem(name, v8 + 7 * MOUSECOMBO_WIDTH_NS + 7, MOUSECOMBO_WIDTH_NS);
-		_vm->_system->setMouseCursor(v8, MOUSECOMBO_WIDTH_NS, MOUSECOMBO_HEIGHT_NS, 0, 0, 0);
+		CursorMan.replaceCursor(v8, MOUSECOMBO_WIDTH_NS, MOUSECOMBO_HEIGHT_NS, 0, 0, 0);
 		break;
 	}
 
@@ -555,7 +556,7 @@
 		memcpy(dst, src, _comboArrow->getSize(0));
 		// FIXME: destination offseting is not clear
 		_vm->_inventoryRenderer->drawItem(name, dst + _mouseComboProps_BR._yOffset * _mouseComboProps_BR._width + _mouseComboProps_BR._xOffset, _mouseComboProps_BR._width);
-		_vm->_system->setMouseCursor(dst, _mouseComboProps_BR._width, _mouseComboProps_BR._height, 0, 0, 0);
+		CursorMan.replaceCursor(dst, _mouseComboProps_BR._width, _mouseComboProps_BR._height, 0, 0, 0);
 		break;
 	}
 


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