Ticket #8624: dialog_save_tmpfile.patch

engines/scumm/input.cpp

@@ -410 +410 @@
         // Fall back to default behavior
         ScummEngine::processKeyboard(lastKeyHit);
 
+        // On Alt-F5 prepare savegame for the original save/load dialog. 
+        if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT) {
+                prepareSavegame();
+        }
+
         if (VAR_KEYPRESS != 0xFF && _mouseAndKeyboardStat) {            // Key Input
                 if (315 <= _mouseAndKeyboardStat && _mouseAndKeyboardStat <= 323) {
                         // Convert F-Keys for V1/V2 games (they start at 1)
@@ -424 +429 @@
         // Fall back to default behavior
         ScummEngine::processKeyboard(lastKeyHit);
 
-        // 'i' brings up an IQ dialog in Indy3
-        if (lastKeyHit.ascii == 'i' && _game.id == GID_INDY3) {
+        // On Alt-F5 prepare savegame for the original save/load dialog. 
+        if (lastKeyHit.keycode == Common::KEYCODE_F5 && lastKeyHit.flags == Common::KBD_ALT) {
+                prepareSavegame();
+        }
+
+        // 'i' brings up an IQ dialog in Indy3 (disabled in save/load dialog for input)
+        if (lastKeyHit.ascii == 'i' && _game.id == GID_INDY3 && _currentRoom != 14) {
                 // SCUMM var 244 is the episode score
                 // and var 245 is the series score
                 char text[50];

engines/scumm/saveload.cpp

@@ -131 +131 @@
 
 bool ScummEngine::saveState(int slot, bool compat) {
         Common::String filename;
-        Common::OutSaveFile *out;
-        SaveGameHeader hdr;
 
         if (_saveLoadSlot == 255) {
                 // Allow custom filenames for save game system in HE Games
@@ -140 +138 @@
         } else {
                 filename = makeSavegameName(slot, compat);
         }
+
+        return saveState(filename);
+}
+
+bool ScummEngine::saveState(Common::String filename) {
+        Common::OutSaveFile *out;
+        SaveGameHeader hdr;
+
         if (!(out = _saveFileMan->openForSaving(filename.c_str())))
                 return false;
 
@@ -445 +451 @@
         return true;
 }
 
+void ScummEngine::prepareSavegame() {
+        saveState("savegame.tmp");
+}
+
+bool ScummEngine::savePreparedSavegame(int slot, char *desc) {
+        return copyPreparedSavegame("savegame.tmp", slot, desc);
+}
+
+bool ScummEngine::copyPreparedSavegame(Common::String prepFilename, int slot, char *desc) {
+        bool result;
+        uint32 nread;
+        byte buffer[1024];
+        Common::String filename;
+        Common::InSaveFile *in;
+        Common::OutSaveFile *out;
+        SaveGameHeader hdr;
+
+        if (!(in = _saveFileMan->openForLoading(prepFilename.c_str())))
+                return false;
+
+        if (!loadSaveGameHeader(in, hdr)) {
+                warning("Invalid savegame '%s'", prepFilename.c_str());
+                delete in;
+                return false;
+        }
+
+        if (hdr.ver != CURRENT_VER) {
+                warning("Incompatible savegame '%s'", prepFilename.c_str());
+                delete in;
+                return false;
+        }
+
+        filename = makeSavegameName(slot, false);
+        if (!(out = _saveFileMan->openForSaving(filename.c_str()))) {
+                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;
+}
+
 Common::String ScummEngine::makeSavegameName(const Common::String &target, int slot, bool temporary) {
         char extension[6];
         snprintf(extension, sizeof(extension), ".%c%02d", temporary ? 'c' : 's', slot);

engines/scumm/script_v5.cpp

@@ -869 +869 @@
         // which matches the original Indy3 save/load code. See also the notes
         // on Feature Request #1666521.
         STRINGID_IQ_EPISODE = 7,
-        STRINGID_IQ_SERIES = 9
+        STRINGID_IQ_SERIES = 9,
+        // The string IDs of the first savegame name, used as an offset to determine
+        // the IDs of all savenames. 
+        // Loom is the only game whose savenames start with a different ID.
+        STRINGID_SAVENAME1 = 10,
+        STRINGID_SAVENAME1_LOOM = 9
 };
 
 void ScummEngine_v5::o5_saveLoadVars() {
@@ -1235 +1240 @@
                 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) ? STRINGID_SAVENAME1_LOOM : STRINGID_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
                 {

engines/scumm/scumm.h

@@ -626 +626 @@
         char _saveLoadFileName[32];
         char _saveLoadName[32];
 
+        bool saveState(Common::String filename);
         bool saveState(int slot, bool compat);
         bool loadState(int slot, bool compat);
         virtual void saveOrLoad(Serializer *s);
@@ -633 +634 @@
         void saveResource(Serializer *ser, int type, int index);
         void loadResource(Serializer *ser, int type, int index);
 
+        void prepareSavegame();
+        bool savePreparedSavegame(int slot, char *desc);
+        bool copyPreparedSavegame(Common::String prepFilename, int slot, char *desc);
+
         Common::String makeSavegameName(int slot, bool temporary) const {
                 return makeSavegameName(_targetName, slot, temporary);
         }