Ticket #1738: loom_cursor_fix.diff

scumm/cursor.cpp

@@ -64 +64 @@
           0x1004, 0x2002, 0x0000, 0x0080, 0x01c0, 0x02a0, 0x0080, 0x0000 },
 };
 
-static const byte default_cursor_hotspots[10] = {
+static byte default_cursor_hotspots[10] = {
         8, 7,   8, 7,   1, 1,   5, 0,
         8, 7, //zak256
 };
@@ -82 +82 @@
         }
 }
 
+void ScummEngine::setCursorHotspot(int index, int x, int y) {
+        // FIXME: Is this needed for other games, as well?
+        if (_gameId == GID_LOOM || _gameId == GID_LOOM256) {
+                default_cursor_hotspots[2 * index] = x;
+                default_cursor_hotspots[2 * index + 1] = y;
+        } else
+                setCursorHotspot(x, y);
+}
+
 void ScummEngine::setCursorHotspot(int x, int y) {
         _cursor.hotspotX = x;
         _cursor.hotspotY = y;

scumm/script_v5.cpp

@@ -683 +683 @@
                 i = getVarOrDirectByte(PARAM_1);
                 j = getVarOrDirectByte(PARAM_2);
                 k = getVarOrDirectByte(PARAM_3);
-                setCursorHotspot(j, k);
+                setCursorHotspot(i, j, k);
                 break;
         case 12:                // SO_CURSOR_SET
                 i = getVarOrDirectByte(PARAM_1);

scumm/scumm.h

@@ -936 +936 @@
         void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor);
         void desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor);
 
+        void setCursorHotspot(int index, int x, int y);
         void setCursorHotspot(int x, int y);
         void setCursorTransparency(int a);
         void setupCursor();