[Scummvm-cvs-logs] CVS: scummvm/sky mouse.cpp,1.31,1.32 mouse.h,1.24,1.25

[Joost Peters]

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

Modified Files:
	mouse.cpp mouse.h 
Log Message:
Get rid of mouse transparancy hack


Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- mouse.cpp	28 Mar 2004 16:30:49 -0000	1.31
+++ mouse.cpp	6 May 2004 00:25:18 -0000	1.32
@@ -93,11 +93,9 @@
 	_currentCursor = 6;
 	
 	_miceData = _skyDisk->loadFile(MICE_FILE, NULL);
-	fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);
 
 	//load in the object mouse file
 	_objectMouseData = _skyDisk->loadFile(MICE_FILE + 1, NULL);
-	fixMouseTransparency(_objectMouseData, _skyDisk->_lastLoadedFileSize);
 }
 
 Mouse::~Mouse( ){
@@ -107,7 +105,6 @@
 
 void Mouse::replaceMouseCursors(uint16 fileNo) {
 	_skyDisk->loadFile(fileNo, _objectMouseData);
-	fixMouseTransparency(_objectMouseData, _skyDisk->_lastLoadedFileSize);
 }
 
 bool Mouse::fnAddHuman(void) {
@@ -177,25 +174,6 @@
 	}
 }
 
-//original sky uses different colors for transparency than our backends do,
-//so we simply swap our "transparent"-white with another one.
-void Mouse::fixMouseTransparency(byte *mouseData, uint32 size) {
-	uint32 curPos = sizeof(struct dataFileHeader);
-	uint32 cursorSize = ((struct dataFileHeader *)mouseData)->s_sp_size;
-
-	while (curPos < size) {
-		byte *cursor = mouseData + curPos;
-		for (uint32 i = 0; i < cursorSize; i++) {
-			if (cursor[i] == 255)
-				cursor[i] = 242;
-			else
-				if (cursor[i] == 0)
-					cursor[i] = 255;
-		}
-		curPos += cursorSize;
-	}
-}
-
 void Mouse::spriteMouse(uint16 frameNum, uint8 mouseX, uint8 mouseY) {
 	
 	_currentCursor = frameNum;
@@ -207,7 +185,7 @@
 	uint16 mouseWidth = ((struct dataFileHeader *)_miceData)->s_width;
 	uint16 mouseHeight = ((struct dataFileHeader *)_miceData)->s_height;
 
-	_system->setMouseCursor(newCursor, mouseWidth, mouseHeight, mouseX, mouseY);
+	_system->setMouseCursor(newCursor, mouseWidth, mouseHeight, mouseX, mouseY, 0);
 	if (frameNum == MOUSE_BLANK) _system->showMouse(false);
 	else _system->showMouse(true);
 }

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mouse.h	6 Jan 2004 12:45:32 -0000	1.24
+++ mouse.h	6 May 2004 00:25:18 -0000	1.25
@@ -63,7 +63,6 @@
 
 	void pointerEngine(uint16 xPos, uint16 yPos);
 	void buttonEngine1(void);
-	void fixMouseTransparency(byte *mouseData, uint32 size);
 
 	bool _logicClick;