[Scummvm-cvs-logs] scummvm master -> df1a800d01918ddda9159e3b9f42e8ef8d701456
clone2727
clone2727 at gmail.com
Mon Mar 7 00:38:20 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
df1a800d01 SCI: Fix KQ6 Mac inventory cursors
Commit: df1a800d01918ddda9159e3b9f42e8ef8d701456
https://github.com/scummvm/scummvm/commit/df1a800d01918ddda9159e3b9f42e8ef8d701456
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-03-06T15:36:45-08:00
Commit Message:
SCI: Fix KQ6 Mac inventory cursors
Changed paths:
engines/sci/graphics/cursor.cpp
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index b085654..09f08e4 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.
More information about the Scummvm-git-logs
mailing list