[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.19,1.20 scummvm.cpp,1.27,1.28

Max Horn fingolfin at users.sourceforge.net
Thu Sep 19 16:07:07 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv31739/scumm

Modified Files:
	gfx.cpp scummvm.cpp 
Log Message:
NewGui now has its own mouse cursor code -> again one less dependency on Scumm; moved makeCursorColorTransparent to gfx.cpp where it belongs

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gfx.cpp	18 Sep 2002 11:48:00 -0000	1.19
+++ gfx.cpp	19 Sep 2002 23:06:54 -0000	1.20
@@ -3001,6 +3001,18 @@
 	updateCursor();
 }
 
+void Scumm::makeCursorColorTransparent(int a)
+{
+	int i, size;
+
+	size = _cursorWidth * _cursorHeight;
+
+	for (i = 0; i < size; i++)
+		if (_grabbedCursor[i] == (byte)a)
+			_grabbedCursor[i] = 0xFF;
+
+	updateCursor();
+}
 
 int Scumm::remapPaletteColor(int r, int g, int b, uint threshold)
 {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- scummvm.cpp	19 Sep 2002 21:45:56 -0000	1.27
+++ scummvm.cpp	19 Sep 2002 23:06:54 -0000	1.28
@@ -1116,19 +1116,6 @@
 	return derefActor(id);
 }
 
-void Scumm::makeCursorColorTransparent(int a)
-{
-	int i, size;
-
-	size = _cursorWidth * _cursorHeight;
-
-	for (i = 0; i < size; i++)
-		if (_grabbedCursor[i] == (byte)a)
-			_grabbedCursor[i] = 0xFF;
-
-	updateCursor();
-}
-
 void Scumm::setStringVars(int slot)
 {
 	StringTab *st = &string[slot];





More information about the Scummvm-git-logs mailing list