[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.63,1.64 display.h,1.45,1.46

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11329/queen

Modified Files:
	display.cpp display.h 
Log Message:
make use of OSystem::setMouseCursor() change

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- display.cpp	28 Mar 2004 16:30:48 -0000	1.63
+++ display.cpp	5 May 2004 18:03:41 -0000	1.64
@@ -61,8 +61,6 @@
 	_backdropBuf = (uint8 *)calloc(BACKDROP_W * BACKDROP_H, sizeof(uint8));
 #endif
 
-	memset(_mousePtr, 0, sizeof(_mousePtr));
-
 	_fullRefresh = 1;
 	_dirtyBlocksWidth  = SCREEN_W / D_BLOCK_W;
 	_dirtyBlocksHeight = SCREEN_H / D_BLOCK_H;
@@ -789,20 +787,7 @@
 }
 
 void Display::setMouseCursor(uint8 *buf, uint16 w, uint16 h) {
-	assert(w == 14 && h == 14);
-	uint16 size = 14 * 14;
-	memcpy(_mousePtr, buf, size);
-	// change transparency color to match the one expected by the backend (0xFF)
-	uint8 *p = _mousePtr;
-	while (size--) {
-		if (*p == 255) {
-			*p = 254;
-		} else if (*p == 0) {
-			*p = 255;
-		}
-		++p;
-	}
-	_system->setMouseCursor(_mousePtr, 14, 14, 1, 1);
+	_system->setMouseCursor(buf, w, h, 1, 1, 0);
 }
 
 void Display::showMouseCursor(bool show) {

Index: display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- display.h	18 Mar 2004 21:53:49 -0000	1.45
+++ display.h	5 May 2004 18:03:41 -0000	1.46
@@ -152,8 +152,6 @@
 	uint8 *_panelBuf;
 	uint8 *_backdropBuf;
 
-	uint8 _mousePtr[14 * 14];
-
 	uint8 _fullRefresh;
 	uint8 *_dirtyBlocks;
 	uint16 _dirtyBlocksWidth, _dirtyBlocksHeight;