[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.59,2.60 script_v5.cpp,1.50,1.51 scummvm.cpp,2.110,2.111

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3280

Modified Files:
	gfx.cpp script_v5.cpp scummvm.cpp 
Log Message:
fix loom mouse position quirks (even simplified the code :-)

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.59
retrieving revision 2.60
diff -u -d -r2.59 -r2.60
--- gfx.cpp	26 Apr 2003 13:28:33 -0000	2.59
+++ gfx.cpp	28 Apr 2003 18:35:26 -0000	2.60
@@ -3279,10 +3279,6 @@
 		_cursor.hotspotX = 0;
 		_cursor.hotspotY = 0;
 		
-		// FIXME - this corrects the cursor hotspot in Loom (EGA)
-		if (_gameId == GID_LOOM)
-			_cursor.hotspotY = 15;
-
 		for (i = 0; i < 8; i++) {
 			w += (i >= 6) ? -2 : 1;
 			for (j = 0; j < w; j++)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- script_v5.cpp	28 Apr 2003 14:46:55 -0000	1.50
+++ script_v5.cpp	28 Apr 2003 18:35:27 -0000	1.51
@@ -2546,6 +2546,8 @@
 printf("o5_oldRoomEffect ODDBALL: _opcode = 0x%x, a = 0x%x\n", _opcode, a);
 				// No idea what byte_2FCCF is, but it's a globale boolean flag.
 				// I only add it here as a temporary hack to make the pseudo code compile.
+				// Maybe it is just there as a reentry protection guard, given
+				// how it is used?
 				int byte_2FCCF = 0;
 
 				if (byte_2FCCF) {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.110
retrieving revision 2.111
diff -u -d -r2.110 -r2.111
--- scummvm.cpp	28 Apr 2003 18:19:45 -0000	2.110
+++ scummvm.cpp	28 Apr 2003 18:35:28 -0000	2.111
@@ -1362,21 +1362,13 @@
 	else
 		_virtual_mouse_y = mouse.y;
 
-	if (!(_features & GF_AFTER_V3))
-		_virtual_mouse_y += virtscr[0].topline;
-	else
-		_virtual_mouse_y -= 16;
+	_virtual_mouse_y -= virtscr[0].topline;
 
 	if (_virtual_mouse_y < 0)
 		_virtual_mouse_y = -1;
 
-	if (_features & GF_AFTER_V3) {
-		if (_virtual_mouse_y >= virtscr[0].height + virtscr[0].topline)
-			_virtual_mouse_y = -1;
-	} else {
-		if (_virtual_mouse_y >= virtscr[0].height)
-			_virtual_mouse_y = -1;
-	}
+	if (_virtual_mouse_y >= virtscr[0].height)
+		_virtual_mouse_y = -1;
 
 	if (!_lastKeyHit)
 		return;