[Scummvm-cvs-logs] CVS: scummvm/sky mouse.cpp,1.14,1.15 mouse.h,1.14,1.15

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv7259/sky

Modified Files:
	mouse.cpp mouse.h 
Log Message:
removed unnecessary variables

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mouse.cpp	9 Jun 2003 18:58:37 -0000	1.14
+++ mouse.cpp	1 Jul 2003 23:44:31 -0000	1.15
@@ -91,10 +91,6 @@
 	fixMouseTransparency(_miceData, _skyDisk->_lastLoadedFileSize);
 	_mouseData2 = _miceData;
 
-	uint16 width = FROM_LE_16(((struct dataFileHeader *)_miceData)->s_width);
-	uint16 height = FROM_LE_16(((struct dataFileHeader *)_miceData)->s_height);
-	_savedData = (byte *)malloc((width * height) + sizeof(struct dataFileHeader));
-
 	//load in the object mouse file
 	_objectMouseData = _skyDisk->loadFile(MICE_FILE + 1, NULL);
 	fixMouseTransparency(_objectMouseData, _skyDisk->_lastLoadedFileSize);
@@ -105,7 +101,6 @@
 
 SkyMouse::~SkyMouse( ){
 	free (_miceData);
-	free (_savedData);
 	free (_objectMouseData);
 }
 
@@ -208,7 +203,7 @@
 	_mouseHeight = ((struct dataFileHeader *)mouseData)->s_height;
 
 	//_system->set_mouse_cursor(_mouseData2, _mouseWidth, _mouseHeight, mouseX, mouseY);
-	// there's something wrong about the mouse's hotspot. using 0/0 works fine.
+	// there's something wrong about the mouse's hotspot. using 0/0 works fine. (but the cursor is still a couple of pixels off)
 	_system->set_mouse_cursor(_mouseData2, _mouseWidth, _mouseHeight, 0, 0);
 	if (frameNum == MOUSE_BLANK) _system->show_mouse(false);
 	else _system->show_mouse(true);

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mouse.h	27 Jun 2003 02:54:05 -0000	1.14
+++ mouse.h	1 Jul 2003 23:44:31 -0000	1.15
@@ -84,8 +84,6 @@
 	uint16 _maskWidth;	//width on screen
 	uint16 _maskHeight;	//height on screen
 
-	byte *_savedData;	//place for saved data
-
 	uint32 _mouseFlag;	//bit 0 set when in handler
 				//bit 1 set when screen data has been saved
 				//bit 2 set when we don't want to show mouse