Ticket #8447: scumm_v6_cursor.diff

scumm/cursor.cpp

@@ -75 +75 @@
         0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
+static const byte default_v6_cursor[] = {
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0F,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+        0x0F,0x0F,0x0F,0x0F,0x0F,0x0F, 0x0F,0x0F,0x0F, 0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0xFF,
+        0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0F,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+        0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
+};
+
 ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex)
  : ScummEngine(detector, syst, gs, md5sum, substResFileNameIndex) {
 
@@ -133 +152 @@
         setCursorFromBuffer((byte *)vs->pixels + (y - vs->topline) * vs->pitch + x, w, h, vs->pitch);
 }
 
-void ScummEngine::setCursorFromBuffer(byte *ptr, int width, int height, int pitch) {
+void ScummEngine_v6::setDefaultCursor() {
+        setCursorHotspot(7,6);
+        setCursorFromBuffer(default_v6_cursor,16,16,16);
+}
+
+void ScummEngine::setCursorFromBuffer(const byte *ptr, int width, int height, int pitch) {
         uint size;
         byte *dst;
 

scumm/intern.h

@@ -537 +537 @@
         virtual void writeArray(int array, int index, int base, int value);
         void shuffleArray(int num, int minIdx, int maxIdx);
 
+        void setDefaultCursor();
         void setCursorTransparency(int a);
         void setCursorHotspot(int x, int y);
 

scumm/scumm.cpp

@@ -1835 +1835 @@
 
 void ScummEngine_v6::scummInit() {
         ScummEngine::scummInit();
-
-        if (_gameId == GID_TENTACLE && res.roomno[rtRoom][60]) {
-                // HACK: For DOTT we manually set the default cursor. See also bug #786994
-                setCursorFromImg(697, 60, 1);
-                setCursorTransparency(1);
-        }
+        setDefaultCursor();
 }
 
 void ScummEngine_v60he::scummInit() {

scumm/scumm.h

@@ -983 +983 @@
 
         void setupCursor();
 
-        void setCursorFromBuffer(byte *ptr, int width, int height, int pitch);
+        void setCursorFromBuffer(const byte *ptr, int width, int height, int pitch);
 
 public:
         void markRectAsDirty(VirtScreenNumber virt, int left, int right, int top, int bottom, int dirtybit = 0);