[Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.14,1.15

[Eugene Sandulenko]

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

Modified Files:
	gfx.cpp 
Log Message:
Now cursor is really always shown.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gfx.cpp	2 May 2004 16:32:28 -0000	1.14
+++ gfx.cpp	5 May 2004 02:35:33 -0000	1.15
@@ -1060,26 +1060,28 @@
 }
 
 void GFX_SetCursor(int best_white) {
-	int white = (best_white == 255) ? 254 : best_white;
 	int i;
+	byte keycolor = (best_white == 0) ? 1 : 0;
 
 	// Set up the mouse cursor
-	static byte cursor_img[R_CURSOR_W * R_CURSOR_H] = {
-		255, 255, 255, 0,   255, 255, 255,
-		255, 255, 255, 0,   255, 255, 255,
-		255, 255, 255, 255, 255, 255, 255,
-		0,   0,   255, 255, 255, 0,   0,
-		255, 255, 255, 255, 255, 255, 255,
-		255, 255, 255, 0,   255, 255, 255,
-		255, 255, 255, 0,   255, 255, 255,
+	byte cursor_img[R_CURSOR_W * R_CURSOR_H] = {
+		  0,   0,   0, 255,   0,   0,   0,
+		  0,   0,   0, 255,   0,   0,   0,
+		  0,   0,   0,   0,   0,   0,   0,
+		255, 255,   0,   0,   0, 255, 255,
+		  0,   0,   0,   0,   0,   0,   0,
+		  0,   0,   0, 255,   0,   0,   0,
+		  0,   0,   0, 255,   0,   0,   0,
 	};
 
 	for (i = 0; i < R_CURSOR_W * R_CURSOR_H; i++) {
-		if (cursor_img[i] != 255)
-			cursor_img[i] = white;
+		if (cursor_img[i] != 0)
+			cursor_img[i] = best_white;
+		else
+			cursor_img[i] = keycolor;
 	}
 
-	_system->setMouseCursor(cursor_img, R_CURSOR_W, R_CURSOR_H, 4, 4);
+	_system->setMouseCursor(cursor_img, R_CURSOR_W, R_CURSOR_H, 4, 4, keycolor);
 }
 
 } // End of namespace Saga