Ticket #4771: kyra-update_saveload_functions_to_return_kReadingFailed_when_savegame_not_found.patch

engines/kyra/saveload_hof.cpp

@@ -135 +135 @@
         if (!saveFile) {
                 showMessageFromCCode(0x35, 0x84, 0);
                 snd_playSoundEffect(0x0D);
-                return Common::kUnknownError;
+                return Common::kReadingFailed;
         }
 
         if (header.originalSave)

engines/kyra/saveload_lok.cpp

@@ -42 +42 @@
         SaveHeader header;
         Common::InSaveFile *in = openSaveForReading(fileName, header);
         if (!in)
-                return _saveFileMan->getError();
+                return Common::kReadingFailed;
 
         if (header.originalSave) {
                 // no support for original savefile in Kyrandia 1 (yet)

engines/kyra/saveload_lol.cpp

@@ -46 +46 @@
         Common::InSaveFile *saveFile = openSaveForReading(fileName, header);
         if (!saveFile) {
                 _txt->printMessage(2, "%s", getLangString(0x425d));
-                return Common::kNoError;
+                return Common::kReadingFailed;
         }
 
         _screen->fadeClearSceneWindow(10);

engines/kyra/saveload_mr.cpp

@@ -129 +129 @@
         if (!saveFile) {
                 showMessageFromCCode(17, 0xB3, 0);
                 snd_playSoundEffect(0x0D, 0xC8);
-                return Common::kUnknownError;
+                return Common::kReadingFailed;
         }
 
         if (header.originalSave)