Ticket #8234: cursor-saveload.diff

scummvm/scumm/saveload.cpp

@@ -464 +464 @@
                 MKLINE(Scumm, _cursor.state, sleByte, VER_V8),
                 MKLINE(Scumm, gdi._cursorActive, sleByte, VER_V8),
                 MKLINE(Scumm, _currentCursor, sleByte, VER_V8),
+                MKARRAY(Scumm, _grabbedCursor[0], sleByte, 8192, VER_V20),
+                MKLINE(Scumm, _cursor.width, sleInt16, VER_V20),
+                MKLINE(Scumm, _cursor.height, sleInt16, VER_V20),
+                MKLINE(Scumm, _cursor.hotspotX, sleInt16, VER_V20),
+                MKLINE(Scumm, _cursor.hotspotY, sleInt16, VER_V20),
+                MKLINE(Scumm, _cursor.animate, sleByte, VER_V20),
+                MKLINE(Scumm, _cursor.animateIndex, sleByte, VER_V20),
+                MKLINE(Scumm, _mouse.x, sleInt16, VER_V20),
+                MKLINE(Scumm, _mouse.y, sleInt16, VER_V20),
 
                 MKLINE(Scumm, _doEffect, sleByte, VER_V8),
                 MKLINE(Scumm, _switchRoomEffect, sleByte, VER_V8),
@@ -620 +629 @@
         if (!s->isSaving() && savegameVersion < VER_V14)
                 upgradeGfxUsageBits();
 
+        if (!s->isSaving() && savegameVersion >= VER_V20) {
+                updateCursor();
+                _system->warp_mouse(_mouse.x, _mouse.y);
+        }
+
         s->saveLoadArrayOf(_actors, _numActors, sizeof(_actors[0]), actorEntries);
 
         if (savegameVersion < VER_V9)

scummvm/scumm/saveload.h

@@ -38 +38 @@
         VER_V16,
         VER_V17,
         VER_V18,
-        VER_V19
+        VER_V19,
+        VER_V20
 };
 
-#define CURRENT_VER VER_V19
+#define CURRENT_VER VER_V20
 
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,