[Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.4,2.5 object.cpp,1.174,1.175

[Travis Howell]

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

Modified Files:
	cursor.cpp object.cpp 
Log Message:

Fix mouse cursors hotspot in HE games.
HE games don't change cursor hotspot, when changing cursor image.


Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- cursor.cpp	28 Mar 2004 16:30:48 -0000	2.4
+++ cursor.cpp	24 Jun 2004 12:32:19 -0000	2.5
@@ -160,11 +160,6 @@
 void ScummEngine::setCursorHotspot(int x, int y) {
 	_cursor.hotspotX = x;
 	_cursor.hotspotY = y;
-	// FIXME this hacks around offset cursor in the humongous games
-	if (_features & GF_HUMONGOUS) {
-		_cursor.hotspotX += 15;
-		_cursor.hotspotY += 15;
-	}
 }
 
 void ScummEngine::updateCursor() {

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- object.cpp	21 Jun 2004 05:43:29 -0000	1.174
+++ object.cpp	24 Jun 2004 12:32:19 -0000	1.175
@@ -1388,8 +1388,9 @@
 		w = READ_LE_UINT16(&foir.imhd->v7.width) / 8;
 		h = READ_LE_UINT16(&foir.imhd->v7.height) / 8;
 	} else {
-		setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x),
-		                  READ_LE_UINT16(&foir.imhd->old.hotspot[0].y));
+		if (!(_features & GF_HUMONGOUS))
+			setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x),
+		        	          READ_LE_UINT16(&foir.imhd->old.hotspot[0].y));
 		w = READ_LE_UINT16(&foir.cdhd->v6.w) / 8;
 		h = READ_LE_UINT16(&foir.cdhd->v6.h) / 8;
 	}