From df1a800d01918ddda9159e3b9f42e8ef8d701456 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 6 Mar 2011 18:13:17 -0500
Subject: SCI: Fix KQ6 Mac inventory cursors

---
 engines/sci/graphics/cursor.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'engines/sci/graphics/cursor.cpp')

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index b085654d02..09f08e4b15 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -434,9 +434,15 @@ void GfxCursor::kernelSetMacCursor(GuiResourceId viewNum, int loopNum, int celNu
 
 	if (_macCursorRemap.empty()) {
 		// QFG1/Freddy/Hoyle4 use a straight viewNum->cursor ID mapping
-		// KQ6 seems to use this mapping for its cursors
-		if (g_sci->getGameId() == GID_KQ6)
-			viewNum = loopNum * 1000 + celNum;
+		// KQ6 uses this mapping for its cursors
+		if (g_sci->getGameId() == GID_KQ6) {
+			if (viewNum == 990)      // Inventory Cursors
+				viewNum = loopNum * 16 + celNum + 2000;
+			else if (viewNum == 998) // Regular Cursors
+				viewNum = celNum + 1000;
+			else                     // Unknown cursor, ignored
+				return;
+		}
 	} else {
 		// If we do have the list, we'll be using a remap based on what the
 		// scripts have given us.
-- 
cgit v1.2.3