Ticket #4771: kyra-recover_from_invalid_savegame_slot.patch

engines/kyra/kyra_hof.cpp

@@ -438 +438 @@
         runStartScript(1, 0);
         loadNPCScript();
 
-        if (_gameToLoad == -1) {
+        // Try loading a saved game and fallback to normal game init if it fails
+        if (_gameToLoad == -1 || (_gameToLoad != -1 && !loadGameStateCheck(_gameToLoad))) {
                 snd_playWanderScoreViaMap(52, 1);
                 enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
                 saveGameState(0, "New Game", 0);
-        } else {
-                loadGameStateCheck(_gameToLoad);
-        }
+        }
 
         _screen->showMouse();
 

engines/kyra/kyra_lok.cpp

@@ -409 +409 @@
                 error("Could not load \"_NPC.EMC\" script");
 
         snd_playTheme(1, -1);
-        if (_gameToLoad == -1) {
-                enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
-                if (_abortIntroFlag && _skipIntroFlag && saveFileLoadable(0)) {
-                        _menuDirectlyToLoad = true;
-                        _screen->setMouseCursor(1, 1, _shapes[0]);
-                        _screen->showMouse();
-                        _gui->buttonMenuCallback(0);
-                        _menuDirectlyToLoad = false;
-                } else if (!shouldQuit()) {
-                        saveGameState(0, "New game", 0);
+
+        // Try loading a saved game and fall back to normal path if it fails
+        if (_gameToLoad != -1) {
+                Screen::FontId previousFont = _screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_8_FNT);
+
+                if (loadGameStateCheck(_gameToLoad)) {
+                        _gameToLoad = -1;
+                        return;
                 }
-        } else {
-                _screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_8_FNT);
-                loadGameStateCheck(_gameToLoad);
+
+                // Restore screen font and continue
+                _screen->setFont(previousFont);
                 _gameToLoad = -1;
         }
+
+        enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
+        if (_abortIntroFlag && _skipIntroFlag && saveFileLoadable(0)) {
+                _menuDirectlyToLoad = true;
+                _screen->setMouseCursor(1, 1, _shapes[0]);
+                _screen->showMouse();
+                _gui->buttonMenuCallback(0);
+                _menuDirectlyToLoad = false;
+        } else if (!shouldQuit()) {
+                saveGameState(0, "New game", 0);
+        }
 }
 
 void KyraEngine_LoK::mainLoop() {

engines/kyra/kyra_mr.cpp

@@ -658 +658 @@
         saveGameState(0, "New Game", 0);
         _soundDigital->beginFadeOut(_musicSoundChannel, 60);
         delayWithTicks(60);
-        if (_gameToLoad == -1)
+
+        // Try loading a saved game and fall back to normal scene if it fails
+        if (_gameToLoad == -1 || (_gameToLoad != -1 && loadGameStateCheck(_gameToLoad)))
                 enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
-        else
-                loadGameStateCheck(_gameToLoad);
 
         if (_menuDirectlyToLoad)
                 (*_mainButtonData[0].buttonCallback)(&_mainButtonData[0]);

engines/kyra/kyra_v1.cpp

@@ -266 +266 @@
                                 int saveLoadSlot = 9 - (event.kbd.keycode - Common::KEYCODE_0) + 990;
 
                                 if (event.kbd.flags == Common::KBD_CTRL) {
-                                        loadGameStateCheck(saveLoadSlot);
-                                        _eventList.clear();
-                                        breakLoop = true;
+                                        if (loadGameStateCheck(saveLoadSlot)) {
+                                                _eventList.clear();
+                                                breakLoop = true;
+                                        }
                                 } else {
                                         char savegameName[14];
                                         sprintf(savegameName, "Quicksave %d", event.kbd.keycode - Common::KEYCODE_0);

engines/kyra/kyra_v1.h

@@ -409 +409 @@
 
         static kReadSaveHeaderError readSaveHeader(Common::SeekableReadStream *file, bool loadThumbnail, SaveHeader &header);
 
-        void loadGameStateCheck(int slot);
+        bool loadGameStateCheck(int slot);
         virtual Common::Error loadGameState(int slot) = 0;
         Common::Error saveGameState(int slot, const char *saveName) { return saveGameState(slot, saveName, 0); }
         virtual Common::Error saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;

engines/kyra/saveload.cpp

@@ -256 +256 @@
         }
 }
 
-void KyraEngine_v1::loadGameStateCheck(int slot) {
-        if (loadGameState(slot) != Common::kNoError) {
+bool KyraEngine_v1::loadGameStateCheck(int slot) {
+        Common::Error ret = loadGameState(slot);
+
+        if (ret != Common::kNoError) {
                 const char *filename = getSavegameFilename(slot);
                 Common::String errorMessage = "Could not load savegame: '";
                 errorMessage += filename;
                 errorMessage += "'";
 
                 GUIErrorMessage(errorMessage);
+
+                // In case the file does not exist, we get a reading failed error and we can recover from it
+                if (ret == Common::kReadingFailed) {
+                        warning("%s", errorMessage.c_str());
+                        return false;
+                }
+
+                // The loading failed and the engine is in an unknown state, so we throw an error
                 error("%s", errorMessage.c_str());
+                return false;
         }
+
+        return true;
 }
 
 } // End of namespace Kyra