Ticket #8784: savehack.patch

engines/cine/various.cpp

@@ -390 +390 @@
 bool CineEngine::makeLoad(char *saveName) {
         int16 i;
         int16 size;
+        bool oldSave = false;
         Common::InSaveFile *fHandle;
 
         fHandle = g_saveFileMan->openForLoading(saveName);
@@ -539 +540 @@
 
         fHandle->readUint16BE();
         fHandle->readUint16BE();
+        
+        animDataTable[0].width = fHandle->readUint16BE();
+        animDataTable[0].var1 = fHandle->readUint16BE();
+        animDataTable[0].bpp = fHandle->readUint16BE();
+        animDataTable[0].height = fHandle->readUint16BE();
+        animDataTable[0].ptr1 = NULL;
+        animDataTable[0].ptr2 = NULL;
+        animDataTable[0].fileIdx = fHandle->readSint16BE();
+        animDataTable[0].frameIdx = fHandle->readSint16BE();
+        fHandle->read(animDataTable[0].name, 10);
 
-        for (i = 0; i < NUM_MAX_ANIMDATA; i++) {
+        // ugly hack that may not work
+        // guess whether we're loading 0.10.0 buggy save or original save
+        // original save has 8 extra almost meaningless bytes before fileIdx,
+        // therefore name[8] will be non-zero
+        // 9-character part name in 0.10.0 means BIG trouble, luckily
+        // that can't happen in unmodified game
+        if (animDataTable[0].name[8] != 0) {
+                oldSave = true;
+                animDataTable[0].refresh = (animDataTable[0].fileIdx ||
+                        animDataTable[0].frameIdx) ? 1 : 0;
+                Common::MemoryReadStream readS((byte*)animDataTable[0].name+4, 10);
+                animDataTable[0].fileIdx = readS.readUint16BE();
+                animDataTable[0].frameIdx = readS.readUint16BE();
+                animDataTable[0].name[0] = animDataTable[0].name[8];
+                animDataTable[0].name[1] = animDataTable[0].name[9];
+                fHandle->read(animDataTable[0].name+2, 8);
+        } else {
+                animDataTable[0].refresh = (fHandle->readByte() != 0);
+        }
+
+        for (i = 1; i < NUM_MAX_ANIMDATA; i++) {
                 animDataTable[i].width = fHandle->readUint16BE();
                 animDataTable[i].var1 = fHandle->readUint16BE();
                 animDataTable[i].bpp = fHandle->readUint16BE();
                 animDataTable[i].height = fHandle->readUint16BE();
+                if(oldSave) {
+                        animDataTable[i].refresh = (fHandle->readUint32BE() != 0);
+                        fHandle->readUint32BE();
+                }
                 animDataTable[i].ptr1 = NULL;
                 animDataTable[i].ptr2 = NULL;
                 animDataTable[i].fileIdx = fHandle->readSint16BE();
                 animDataTable[i].frameIdx = fHandle->readSint16BE();
                 fHandle->read(animDataTable[i].name, 10);
-                animDataTable[i].refresh = (fHandle->readByte() != 0);
+                if(!oldSave) {
+                        animDataTable[i].refresh = (fHandle->readByte() != 0);
+                }
         }
 
         // TODO: handle screen params (really required ?)
@@ -706 +743 @@
                 fHandle->writeUint16BE(animDataTable[i].var1);
                 fHandle->writeUint16BE(animDataTable[i].bpp);
                 fHandle->writeUint16BE(animDataTable[i].height);
+                // This file format looks like Delphine guys
+                // hacked it together 10 minutes before release deadline...
+                // Just because I write pointers to a file doesn't mean
+                // anyone should actually read those values back!
+                fHandle->writeUint32BE((uint32)animDataTable[i].ptr1);
+                fHandle->writeUint32BE((uint32)animDataTable[i].ptr2);
                 fHandle->writeSint16BE(animDataTable[i].fileIdx);
                 fHandle->writeSint16BE(animDataTable[i].frameIdx);
                 fHandle->write(animDataTable[i].name, 10);
-
-                // Horrifyingly, cinE used to dump the entire struct to the
-                // save file, including the data pointers. While these pointers
-                // would be invalid after loading, the loadResourcesFromSave()
-                // function would still test if ptr1 was non-NULL, presumably
-                // to see if the object was present in the room.
-
-                fHandle->writeByte(animDataTable[i].ptr1 ? 1 : 0);
         }
 
         fHandle->writeUint16BE(0);  // Screen params, unhandled