Ticket #1863: loom-cursor.diff

scumm/cursor.cpp

@@ -26 +26 @@
 #include "scumm/intern.h"
 #include "scumm/object.h"
 #include "scumm/resource_v7he.h"
+#include "scumm/saveload.h"
 #include "scumm/scumm.h"
 
 
@@ -395 +396 @@
         updateCursor();
 }
 
+void ScummEngine_v5::saveOrLoadCursorImages(Serializer *s) {
+        const SaveLoadEntry cursorEntries[] = {
+                MKARRAY2(ScummEngine_v5, _cursorImages[0][0], sleUint16, 16, 4, (byte*)_cursorImages[1] - (byte*)_cursorImages[0], VER(44)),
+                MKARRAY(ScummEngine_v5, _cursorHotspots[0], sleByte, 8, VER(44)),
+                MKEND()
+        };
+
+        s->saveLoadEntries(this, cursorEntries);
+}
+
 } // End of namespace Scumm

scumm/intern.h

@@ -76 +76 @@
         void setBuiltinCursor(int index);
         void redefineBuiltinCursorFromChar(int index, int chr);
         void redefineBuiltinCursorHotspot(int index, int x, int y);
+        void saveOrLoadCursorImages(Serializer *s);
 
         /* Version 5 script opcodes */
         void o5_actorFollowCamera();

scumm/saveload.cpp

@@ -877 +877 @@
                 _imuseDigital->saveOrLoad(s);
         }
 
+        // This is probably only needed for Loom.
+        saveOrLoadCursorImages(s);
+
         if (s->isLoading())
                 setupVolumes();
 }

scumm/saveload.h

@@ -32 +32 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 43
+#define CURRENT_VER 44
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC
-// versions hae a heuristic built in to detect "offset-of" patterns - which is exactly
+// versions have a heuristic built in to detect "offset-of" patterns - which is exactly
 // what our OFFS macro does. Now, for non-POD types this is not really legal, because
 // member need not be at a fixed offset relative to the variable, even if they are in
 // current reality (many of our complex structs are non-POD; for an explanation of 

scumm/scumm.h

@@ -386 +386 @@
         void updateCursor();
         virtual void animateCursor() {}
         void updatePalette();
+        virtual void saveOrLoadCursorImages(Serializer *s) {}
 
         /**
          * Flag which signals that the SMUSH video playback should end now