[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _mouse.cpp,1.6,1.7

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv16996

Modified Files:
	_mouse.cpp 
Log Message:
Removed some memset()s that I added earlier out of paranoia. Added a FIXME
comment, noting that DrawMouse() used to handle the "luggage animations" as
well. I don't know if I broke anything when I moved that part of the code.


Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- _mouse.cpp	20 Aug 2003 11:04:32 -0000	1.6
+++ _mouse.cpp	20 Aug 2003 11:28:22 -0000	1.7
@@ -234,8 +234,11 @@
 
 
 int32 DrawMouse(void) {
+	// FIXME: In the original code, luggage animations were decoded here
+	// as well. Luggage animations and mouse animations were not mutually
+	// exclusive. Was that a necessary feature?
+
 	if (mouseAnim) {
-		memset(_mouseData, 0, sizeof(_mouseData));
 		DecompressMouse(_mouseData, mouseSprite, mouseAnim->mousew * mouseAnim->mouseh);
 		g_sword2->_system->set_mouse_cursor(_mouseData, mouseAnim->mousew, mouseAnim->mouseh, mouseAnim->xHotSpot, mouseAnim->yHotSpot - MENUDEEP);
 	}
@@ -329,8 +332,6 @@
 		luggageOffset = (int32 *) ((uint8 *) luggageAnim + sizeof(_mouseAnim));
 
 		// The luggage animation is only one frame.
-
-		memset(_mouseData, 0, sizeof(_mouseData));
 
 		DecompressMouse(_mouseData, (uint8 *) luggageAnim + *mouseOffsets, luggageAnim->mousew * luggageAnim->mouseh);
 		DecompressMouse(_mouseData, (uint8 *) luggageAnim + *luggageOffset, luggageAnim->mousew * luggageAnim->mouseh);