Ticket #8624: dialog_save.2.patch

engines/scumm/input.cpp

@@ -499 +499 @@
 
         // Alt-F5 brings up the original save/load dialog.
 
-        if (lastKeyHit == 440 && _game.version > 2 && _game.version < 8) {
-                lastKeyHit = saveloadkey;
-                saveloadkey = -1;
+        if (lastKeyHit == 440) {
+                if(_game.version <= 3)
+                        prepareSavegame();
+                if(_game.version > 2 && _game.version < 8) {
+                        lastKeyHit = saveloadkey;
+                        saveloadkey = -1;
+                }
         }
 
         if (lastKeyHit == saveloadkey) {

engines/scumm/scumm.h

@@ -330 +330 @@
 
 enum ResIds {
         RESID_IQ_EPISODE = 7,
-        RESID_IQ_SERIES = 9
+        RESID_IQ_SERIES = 9,
+        RESID_SAVENAME1 = 10,
+        RESID_SAVENAME1_LOOM = 9
 };
 
 
@@ -624 +626 @@
         void requestSave(int slot, const char *name, bool temporary = false);
         void requestLoad(int slot);
 
+        void prepareSavegame();
+        bool savePreparedSavegame(int slot, char *desc);
+        bool copyRenameSavegame(int oldSlot, bool oldTemporary, int newSlot, bool newTemporary, char *desc);
+
 // thumbnail + info stuff
 public:
         Graphics::Surface *loadThumbnailFromSlot(int slot);

engines/scumm/saveload.cpp

@@ -84 +84 @@
         _saveLoadFlag = 2;              // 2 for load
 }
 
+static bool saveSaveGameHeader(Common::OutSaveFile *out, SaveGameHeader &hdr) {
+        hdr.type = MKID_BE('SCVM');
+        hdr.size = 0;
+        hdr.ver = CURRENT_VER;
+
+        out->writeUint32BE(hdr.type);
+        out->writeUint32LE(hdr.size);
+        out->writeUint32LE(hdr.ver);
+        out->write(hdr.name, sizeof(hdr.name));
+        return true;
+}
+
 bool ScummEngine::saveState(int slot, bool compat) {
         char filename[256];
         Common::OutSaveFile *out;
@@ -95 +107 @@
                 return false;
 
         memcpy(hdr.name, _saveLoadName, sizeof(hdr.name));
-
-        hdr.type = MKID_BE('SCVM');
-        hdr.size = 0;
-        hdr.ver = CURRENT_VER;
-
-        out->writeUint32BE(hdr.type);
-        out->writeUint32LE(hdr.size);
-        out->writeUint32LE(hdr.ver);
-        out->write(hdr.name, sizeof(hdr.name));
+        saveSaveGameHeader(out, hdr);
         saveThumbnail(out);
         saveInfos(out);
 
@@ -429 +433 @@
         return true;
 }
 
+void ScummEngine::prepareSavegame() {
+        saveState(0, true);
+}
+
+bool ScummEngine::savePreparedSavegame(int slot, char *desc) {
+        return copyRenameSavegame(0, true, slot, false, desc);
+}
+
+bool ScummEngine::copyRenameSavegame(int oldSlot, bool oldTemporary, int newSlot, bool newTemporary, char *desc) {
+        bool result;
+        uint32 nread;
+        byte buffer[1024];
+        char oldFilename[256];
+        char newFilename[256];
+        Common::InSaveFile *in;
+        Common::OutSaveFile *out;
+        SaveGameHeader hdr;
+
+        makeSavegameName(oldFilename, oldSlot, oldTemporary);
+        if (!(in = _saveFileMan->openForLoading(oldFilename)))
+                return false;
+
+        if (!loadSaveGameHeader(in, hdr)) {
+                warning("Invalid savegame '%s'", oldFilename);
+                delete in;
+                return false;
+        }
+
+        if (hdr.ver != CURRENT_VER) {
+                warning("Incompatible savegame '%s'", oldFilename);
+                delete in;
+                return false;
+        }
+
+        makeSavegameName(newFilename, newSlot, newTemporary);
+        if (!(out = _saveFileMan->openForSaving(newFilename))) {
+                delete in;
+                return false;
+        }
+
+        memset(hdr.name, 0, sizeof(hdr.name));
+        strncpy(hdr.name, desc, sizeof(hdr.name)-1);
+        saveSaveGameHeader(out, hdr);
+        
+        // copy bytes
+        result = true;
+        while (nread = in->read(buffer, sizeof(buffer))) {
+                uint32 nwritten = out->write(buffer, nread);
+                if (nwritten < nread) {
+                        result = false;
+                        break;
+                }
+        }
+
+        out->finalize();
+        if (out->ioFailed()) {
+                result = false;
+        }
+        delete in;
+        delete out;
+
+        return result;
+}
+
 Graphics::Surface *ScummEngine::loadThumbnailFromSlot(int slot) {
         char filename[256];
         Common::InSaveFile *in;

engines/scumm/script_v5.cpp

@@ -1222 +1222 @@
                 result = 100;
                 break;
         case 0x20: // drive
-                if (_game.id == GID_INDY3) {
-                        // 0 = hard drive
-                        // 1 = disk drive
-                        result = 0;
+                if (_game.version <= 3) {
+                        // 0 = ???
+                        // [1,2] = disk drive [A:,B:]
+                        // 3 = hard drive
+                        result = 3;
                 } else {
                         // set current drive
                         result = 1;
                 }
                 break;
         case 0x40: // load
-                if (loadState(slot, _saveTemporaryState))
+                if (loadState(slot, false))
                         result = 3; // sucess
                 else
                         result = 5; // failed to load
                 break;
         case 0x80: // save
-                //if (saveState(slot, _saveTemporaryState))
-                //      result = 0; // sucess
-                //else
+                if (_game.version <= 3) {
+                        char name[32];
+                        if (_game.version <= 2) {
+                                // use generic name
+                                sprintf(name, "Game %c", 'A'+slot-1);
+                        } else {
+                                // use name entered by the user
+                                char* ptr;
+                                int firstSlot = (_game.id == GID_LOOM) ? RESID_SAVENAME1_LOOM : RESID_SAVENAME1;
+                                ptr = (char*)getStringAddress(slot + firstSlot - 1);
+                                strncpy(name, ptr, sizeof(name));
+                        }
+
+                        if(savePreparedSavegame(slot, name))
+                                result = 0;
+                        else
+                                result = 2;
+                } else {
                         result = 2; // failed to save
+                }
                 break;
         case 0xC0: // test if save exists
                 Common::InSaveFile *file;