fix loom mouse position quirks (even simplified the code :-)

svn-id: r7187

3 files changed, 5 insertions, 15 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index f32a482afd..40ec569879 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -3279,10 +3279,6 @@ void Scumm::decompressDefaultCursor(int idx) {
 		_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++)
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 37c97c6acc..dcf1e1ca80 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -2546,6 +2546,8 @@ void Scumm_v5::o5_oldRoomEffect() {
 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) {
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 447f88642c..093e22cfb6 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1362,21 +1362,13 @@ void Scumm::processKbd() {
 	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;