X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=saveresume.c;h=3546378a5ae6d4e7e6ae44db7fb18b7e91beeb46;hb=a76cbeccbb1e7d957cf7036a7125abb48f22eb9d;hp=6f570b9aab8a874fe4f0a3aad4b20468ef8ff4da;hpb=b3057f038bc990e216c1763f7de1f485892296d2;p=open-adventure.git

diff --git a/saveresume.c b/saveresume.c
index 6f570b9..3546378 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -24,13 +24,25 @@ struct save_t {
     long mode;		/* not used, must be present for version detection */
     long version;
     struct game_t game;
-    long bird;
-    long bivalve;
 };
 struct save_t save;
 
+int savefile(FILE *fp)
+    /* 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 = VRSION;
+    memcpy(&save.game, &game, sizeof(struct game_t));
+    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+    return(0);
+}
+
 /* Suspend and resume */
-int suspend(FILE *input)
+int suspend(void)
 {
     /*  Suspend.  Offer to save things in a file, but charging
      *  some points (so can't win by using saved games to retry
@@ -40,11 +52,10 @@ int suspend(FILE *input)
 #ifdef ADVENT_NOSAVE
     return GO_UNKNOWN;
 #endif
-    long i, k;
     FILE *fp = NULL;
 
-    RSPEAK(SUSPEND_WARNING);
-    if (!YES(input, THIS_ACCEPTABLE, OK_MAN, OK_MAN)) return GO_CLEAROBJ;
+    rspeak(SUSPEND_WARNING);
+    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) {
@@ -57,21 +68,14 @@ int suspend(FILE *input)
         linenoiseFree(name);
     }
 
-    DATIME(&i, &k);
-    k = i + 650 * k;
-    save.savetime = k;
-    save.mode = -1;
-    save.version = VRSION;
-    memcpy(&save.game, &game, sizeof(struct game_t));
-    save.bird = OBJSND[BIRD];
-    save.bivalve = OBJTXT[OYSTER];
+    savefile(fp);
     IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
     fclose(fp);
-    RSPEAK(RESUME_HELP);
+    rspeak(RESUME_HELP);
     exit(0);
 }
 
-int resume(FILE *input)
+int resume(void)
 {
     /*  Resume.  Read a suspended game back from a file.
      *  If ADVENT_NOSAVE is defined, do nothing instead. */
@@ -82,8 +86,8 @@ int resume(FILE *input)
     FILE *fp = NULL;
 
     if (game.loc != 1 || game.abbrev[1] != 1) {
-        RSPEAK(RESUME_ABANDON);
-        if (!YES(input, THIS_ACCEPTABLE, OK_MAN, OK_MAN)) return GO_CLEAROBJ;
+        rspeak(RESUME_ABANDON);
+        if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
     }
 
     while (fp == NULL) {
@@ -111,16 +115,12 @@ int restore(FILE* fp)
     IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
     fclose(fp);
     if (save.version != VRSION) {
-        SETPRM(1, save.version / 10, MOD(save.version, 10));
-        SETPRM(3, VRSION / 10, MOD(VRSION, 10));
-        RSPEAK(VERSION_SKEW);
+        rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10));
     } else {
         memcpy(&game, &save.game, sizeof(struct game_t));
-        OBJSND[BIRD] = save.bird;
-        OBJTXT[OYSTER] = save.bivalve;
-        game.zzword = RNDVOC(3, game.zzword);
+        game.zzword = rndvoc(3, game.zzword);
     }
     return GO_TOP;
 }
 
-/* end */
\ No newline at end of file
+/* end */