foxygit / doom Log in
commit 0fe9bbcffeb7f7fdb032642127cca54b7d965227
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Wed Feb 14 01:43:36 2018 -0800
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Wed Feb 14 01:43:36 2018 -0800

    When a savegame can't be loaded, exit with an error.

    Closes #990, affects Doom, Heretic, Hexen, not Strife.
---
 src/doom/g_game.c     | 2 +-
 src/heretic/p_saveg.c | 5 +++++
 src/hexen/sv_save.c   | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/doom/g_game.c b/src/doom/g_game.c
index abafeccb..89aaafed 100644
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -1553,7 +1553,7 @@ void G_DoLoadGame (void)

     if (save_stream == NULL)
     {
-        return;
+        I_Error ("Could not load savegame");
     }

     savegame_error = false;
diff --git a/src/heretic/p_saveg.c b/src/heretic/p_saveg.c
index b644f58f..0439f295 100644
--- a/src/heretic/p_saveg.c
+++ b/src/heretic/p_saveg.c
@@ -66,6 +66,11 @@ void SV_Open(char *fileName)
 void SV_OpenRead(char *filename)
 {
     SaveGameFP = fopen(filename, "rb");
+
+    if (SaveGameFP == NULL)
+    {
+        I_Error ("Could not load savegame");
+    }
 }

 //==========================================================================
diff --git a/src/hexen/sv_save.c b/src/hexen/sv_save.c
index 6ce43bf2..02b43694 100644
--- a/src/hexen/sv_save.c
+++ b/src/hexen/sv_save.c
@@ -3343,6 +3343,11 @@ static boolean ExistingFile(char *name)
 static void SV_OpenRead(char *fileName)
 {
     SavingFP = fopen(fileName, "rb");
+
+    if (SavingFP == NULL)
+    {
+        I_Error ("Could not load savegame");
+    }
 }

 static void SV_OpenWrite(char *fileName)