Ticket #8019: cursor.diff

scummvm/gfx.cpp

@@ -2627 +2627 @@
 
 void Scumm::decompressDefaultCursor(int idx)
 {
-        int i;
+        int i, j;
         byte color;
 
         memset(_grabbedCursor, 0xFF, sizeof(_grabbedCursor));
-        _cursorWidth = 16;
-        _cursorHeight = 16;
-        _cursorHotspotX = 8;
-        _cursorHotspotY = 8;
-
         color = default_cursor_colors[idx];
 
-        for (i = 0; i < 16; i++) {
-                if ((i < 7) || (i > 9)) {
-                        _grabbedCursor[16 * 8 + i] = color;
-                        _grabbedCursor[16 * i + 8] = color;
+        if (_gameId == GID_LOOM256) {
+                // FIXME - One of the first things that happens when playing
+                // Loom is that setCursor(1) will be called. That's currently
+                // a no-op, but it could mean that this cursor image is to be
+                // found somewhere in the game's resources. But Until someone
+                // manages to figure that out, use this one instead.
+
+                _cursorWidth = 8;
+                _cursorHeight = 8;
+                _cursorHotspotX = 0;
+                _cursorHotspotY = 0;
+
+                for (i = 0; i < 8; i++) {
+                        int w;
+
+                        if (i == 6)
+                                w = 4;
+                        else if (i == 7)
+                                w = 2;
+                        else
+                                w = i + 1;
+
+                        for (j = 0; j < w; j++) {
+                                _grabbedCursor[i * 8 + j] = color;
+                        }
+                }
+        } else {
+                // Standard cross-hair cursor
+
+                _cursorWidth = 16;
+                _cursorHeight = 16;
+                _cursorHotspotX = 7;
+                _cursorHotspotY = 7;
+
+                for (i = 0; i < 15; i++) {
+                        if ((i < 6) || (i > 8)) {
+                                _grabbedCursor[16 * 7 + i] = color;
+                                _grabbedCursor[16 * i + 7] = color;
+                        }
                 }
         }