[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _mouse.cpp,1.7,1.8 rdwin.cpp,1.9,1.10

[Torbj?rn Andersson]

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

Modified Files:
	_mouse.cpp rdwin.cpp 
Log Message:
Applied a different fix for the mouse offset problem. As far as I can tell,
the old way would have made it impossible to access the (not yet
implemented) menu icons at the top of the window. I hope this one works...


Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- _mouse.cpp	20 Aug 2003 11:28:22 -0000	1.7
+++ _mouse.cpp	20 Aug 2003 11:41:43 -0000	1.8
@@ -240,7 +240,7 @@
 
 	if (mouseAnim) {
 		DecompressMouse(_mouseData, mouseSprite, mouseAnim->mousew * mouseAnim->mouseh);
-		g_sword2->_system->set_mouse_cursor(_mouseData, mouseAnim->mousew, mouseAnim->mouseh, mouseAnim->xHotSpot, mouseAnim->yHotSpot - MENUDEEP);
+		g_sword2->_system->set_mouse_cursor(_mouseData, mouseAnim->mousew, mouseAnim->mouseh, mouseAnim->xHotSpot, mouseAnim->yHotSpot);
 	}
 	return RD_OK;
 }

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rdwin.cpp	19 Aug 2003 14:57:26 -0000	1.9
+++ rdwin.cpp	20 Aug 2003 11:41:43 -0000	1.10
@@ -167,7 +167,7 @@
 			break;
 		case OSystem::EVENT_MOUSEMOVE:
 			mousex = event.mouse.x;
-			mousey = event.mouse.y;
+			mousey = event.mouse.y - MENUDEEP;
 			break;
 		case OSystem::EVENT_LBUTTONDOWN:
 			LogMouseEvent(RD_LEFTBUTTONDOWN);