From 85f8dc5dee6fbe78fc5cd30094205cf2ed259fec Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 8 Feb 2011 15:03:23 +0000
Subject: SCI: Add detection for Freddy Pharkas Mac

svn-id: r55828
---
 engines/sci/graphics/cursor.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 258900a3fb..fa75fe7286 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -432,17 +432,21 @@ void GfxCursor::kernelSetMacCursor(GuiResourceId viewNum, int loopNum, int celNu
 	// automatically. 
 
 	if (_macCursorRemap.empty()) {
-		// The scripts have given us no remapping, so let's try to do this manually.
-		// First try and see if the view resource exists. If it does, we're just using
-		// that cursor (QFG1/Hoyle4 do not use Mac cursors, although they have them).
-		if (_resMan->testResource(ResourceId(kResourceTypeView, viewNum))) {
-			CursorMan.disableCursorPalette(true);
-			kernelSetView(viewNum, loopNum, celNum, hotspot);
-			return;
+		// QFG1/Freddy use a straight viewNum->cursor ID mapping
+		if (g_sci->getGameId() != GID_QFG1VGA && g_sci->getGameId() != GID_FREDDYPHARKAS) {
+			// The scripts have given us no remapping, so let's try to do this manually.
+			// First try and see if the view resource exists. If it does, we're just using
+			// that cursor (Hoyle4 does not use Mac cursors, although it has them).
+			if (_resMan->testResource(ResourceId(kResourceTypeView, viewNum))) {
+				CursorMan.disableCursorPalette(true);
+				kernelSetView(viewNum, loopNum, celNum, hotspot);
+				return;
+			} else if (g_sci->getGameId() == GID_KQ6) {
+				// KQ6 seems to use this mapping for its cursors
+				viewNum = loopNum * 1000 + celNum;
+			} else
+				error("Unknown Mac cursor %d", viewNum);
 		}
-
-		// KQ6 seems to use this mapping for its cursors
-		viewNum = loopNum * 1000 + celNum;
 	} 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