Ticket #8624: dialog_save_alternative-1.patch

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
 };
 
 

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;
@@ -1238 +1239 @@
                         result = 5; // failed to load
                 break;
         case 0x80: // save
-                //if (saveState(slot, _saveTemporaryState))
-                //      result = 0; // sucess
-                //else
+                // Save dialogs of old SCUMM games except Loom are cutscene, hence
+                // we can easily break the cutscene and save the state after the cutscene
+                // has terminated. Loom doesn't use cutscene so we would run inside an endless
+                // loop.
+                if (_game.version <= 3 && _game.id != GID_LOOM) {
+                        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));
+                        }
+                        // HACK: works without a temporary savegame but does not behave
+                        // like the original SAVE-dialog (does not work with LOOM)
+                        if (_game.id == GID_INDY3)
+                                saveIQPoints();
+                        abortCutscene();
+                        getScriptEntryPoint();
+                        requestSave(slot, name, false);
+                        // we do not have to return a result actually because we have already
+                        // jumped to the end of the cutscene.
+                } else {
+                        //if (saveState(slot, _saveTemporaryState))
+                        //      result = 0; // sucess
+                        //else
                         result = 2; // failed to save
+                }
                 break;
         case 0xC0: // test if save exists
                 Common::InSaveFile *file;