X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=c8ba37abb59a11b268d31790f010a768616e0d83;hp=5cc97267d1b5119f78e5283a5bcd0940ee30268c;hb=c8f6ff3701534e6c1ce59cf3e33aec5e824ed144;hpb=a37e578f6381e4271459d3acd07b3c5870142d74

diff --git a/saveresume.c b/saveresume.c
index 5cc9726..c8ba37a 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -30,8 +30,9 @@ struct save_t {
 struct save_t save;
 
 /* Suspend and resume */
-int suspend(FILE *input)
-{   /*  Suspend.  Offer to save things in a file, but charging
+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
      *  battles or to start over after learning zzword).
      *  If ADVENT_NOSAVE is defined, do nothing instead. */
@@ -42,22 +43,22 @@ int suspend(FILE *input)
     long i, k;
     FILE *fp = NULL;
 
-    RSPEAK(SUSPEND_WARNING);
-    if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
-    game.saved=game.saved+5;
+    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) {
-	char* name = linenoise("\nFile name: ");
-	if (name == NULL)
-	    return GO_TOP;
-	fp = fopen(name, WRITE_MODE);
-	if (fp == NULL)
-	    printf("Can't open file %s, try again.\n", name); 
-	linenoiseFree(name);
+        char* name = linenoise("\nFile name: ");
+        if (name == NULL)
+            return GO_TOP;
+        fp = fopen(name, WRITE_MODE);
+        if (fp == NULL)
+            printf("Can't open file %s, try again.\n", name);
+        linenoiseFree(name);
     }
 
-    DATIME(&i,&k);
-    k=i+650*k;
+    DATIME(&i, &k);
+    k = i + 650 * k;
     save.savetime = k;
     save.mode = -1;
     save.version = VRSION;
@@ -66,12 +67,13 @@ int suspend(FILE *input)
     save.bivalve = OBJTXT[OYSTER];
     IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
     fclose(fp);
-    RSPEAK(RESUME_HELP);
+    rspeak(RESUME_HELP);
     exit(0);
 }
 
-int resume(FILE *input)
-{   /*  Resume.  Read a suspended game back from a file.
+int resume(void)
+{
+    /*  Resume.  Read a suspended game back from a file.
      *  If ADVENT_NOSAVE is defined, do nothing instead. */
 
 #ifdef ADVENT_NOSAVE
@@ -80,25 +82,26 @@ 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) {
-	char* name = linenoise("\nFile name: ");
-	if (name == NULL)
-	    return GO_TOP;
-	fp = fopen(name, READ_MODE);
-	if (fp == NULL)
-	    printf("Can't open file %s, try again.\n", name); 
-	linenoiseFree(name);
+        char* name = linenoise("\nFile name: ");
+        if (name == NULL)
+            return GO_TOP;
+        fp = fopen(name, READ_MODE);
+        if (fp == NULL)
+            printf("Can't open file %s, try again.\n", name);
+        linenoiseFree(name);
     }
 
     return restore(fp);
 }
 
 int restore(FILE* fp)
-{   /*  Read and restore game state from file, assuming
+{
+    /*  Read and restore game state from file, assuming
      *  sane initial state.
      *  If ADVENT_NOSAVE is defined, do nothing instead. */
 #ifdef ADVENT_NOSAVE
@@ -108,16 +111,14 @@ 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 */