X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=saveresume.c;h=e6c0b0ab8c5218fb25b5f73380551f3707c6c86b;hb=9714bf8c82c37b1c320e078285fca03d81eea614;hp=d2913615ab9e0d078f9a2b0bf91321dbd1fe8c61;hpb=50435465a62d630e4b61fbec38270321211c4907;p=open-adventure.git

diff --git a/saveresume.c b/saveresume.c
index d291361..e6c0b0a 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -2,8 +2,7 @@
 #include <string.h>
 
 #include "advent.h"
-#include "database.h"
-#include "newdb.h"
+#include "dungeon.h"
 #include "linenoise/linenoise.h"
 
 /*
@@ -28,19 +27,19 @@ struct save_t {
 struct save_t save;
 
 int savefile(FILE *fp, long version)
-    /* Save game to file. No input or output from user. */
+/* Save game to file. No input or output from user. */
 {
     long i, k;
     datime(&i, &k);
     k = i + 650 * k;
     save.savetime = k;
     save.mode = -1;
-    
+
     save.version = (version == 0) ? VRSION : version;
-    
+
     memcpy(&save.game, &game, sizeof(struct game_t));
-    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
-    return(0);
+    fwrite(&save, sizeof(struct save_t), 1, fp);
+    return (0);
 }
 
 /* Suspend and resume */
@@ -57,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) {
@@ -73,7 +73,7 @@ int suspend(void)
     savefile(fp, VRSION);
     fclose(fp);
     rspeak(RESUME_HELP);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 int resume(void)
@@ -88,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) {
@@ -113,14 +114,14 @@ 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));
     } else {
         memcpy(&game, &save.game, sizeof(struct game_t));
         //game.zzword = rndvoc(3, game.zzword);
-	make_zzword(game.zzword);
+        make_zzword(game.zzword);
     }
     return GO_TOP;
 }