Various cleanups.

[open-adventure.git] / saveresume.c

diff --git a/saveresume.c b/saveresume.c
index cf5a69626912d9bb166724c4d59ced0a48588a3a..e6c0b0ab8c5218fb25b5f73380551f3707c6c86b 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -38,7 +38,7 @@ int savefile(FILE *fp, long version)
     save.version = (version == 0) ? VRSION : version;
 
     memcpy(&save.game, &game, sizeof(struct game_t));
-    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+    fwrite(&save, sizeof(struct save_t), 1, fp);
     return (0);
 }
 
@@ -56,7 +56,8 @@ int suspend(void)
     FILE *fp = NULL;
 
     rspeak(SUSPEND_WARNING);
-    if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
+    if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+        return GO_CLEAROBJ;
     game.saved = game.saved + 5;
 
     while (fp == NULL) {
@@ -72,7 +73,7 @@ int suspend(void)
     savefile(fp, VRSION);
     fclose(fp);
     rspeak(RESUME_HELP);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 int resume(void)
@@ -87,7 +88,8 @@ int resume(void)
 
     if (game.loc != 1 || game.abbrev[1] != 1) {
         rspeak(RESUME_ABANDON);
-        if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
+        if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN]))
+            return GO_CLEAROBJ;
     }
 
     while (fp == NULL) {
@@ -112,7 +114,7 @@ int restore(FILE* fp)
     return GO_UNKNOWN;
 #endif
 
-    IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
+    fread(&save, sizeof(struct save_t), 1, fp);
     fclose(fp);
     if (save.version != VRSION) {
         rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10));