Documentation polishing.

[open-adventure.git] / saveresume.c

diff --git a/saveresume.c b/saveresume.c
index af94c4aa2043b8d5d7d16273bac2ae99036d15cc..19e65e1274a0f5b9ddb0db29febe9e7dbf90dc94 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -3,6 +3,7 @@
 
 #include "advent.h"
 #include "database.h"
+#include "newdb.h"
 #include "linenoise/linenoise.h"
 
 /*
@@ -33,27 +34,26 @@ int saveresume(FILE *input, bool resume)
 {
     long i, k;
     FILE *fp = NULL;
-    char *name;
- 
+     
     if (!resume) {
        /*  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). */
-       RSPEAK(260);
-       if (!YES(input,200,54,54)) return GO_CLEAROBJ;
+       RSPEAK(SUSPEND_WARNING);
+       if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
        game.saved=game.saved+5;
     }
     else
     {
        /*  Resume.  Read a suspended game back from a file. */
        if (game.loc != 1 || game.abbrev[1] != 1) {
-           RSPEAK(268);
-           if (!YES(input,200,54,54)) return GO_CLEAROBJ;
+           RSPEAK(RESUME_ABANDON);
+           if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
        }
     }
 
     while (fp == NULL) {
-       name = linenoise("\nFile name: ");
+       char* name = linenoise("\nFile name: ");
        if (name == NULL)
            return GO_TOP;
        fp = fopen(name,(resume ? READ_MODE : WRITE_MODE));
@@ -74,7 +74,7 @@ int saveresume(FILE *input, bool resume)
        save.bivalve = OBJTXT[OYSTER];
        IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
        fclose(fp);
-       RSPEAK(266);
+       RSPEAK(RESUME_HELP);
        exit(0);
     } else {
        IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
@@ -82,7 +82,7 @@ int saveresume(FILE *input, bool resume)
        if (save.version != VRSION) {
            SETPRM(1,k/10,MOD(k,10));
            SETPRM(3,VRSION/10,MOD(VRSION,10));
-           RSPEAK(269);
+           RSPEAK(VERSION_SKEW);
        } else {
            memcpy(&game, &save.game, sizeof(struct game_t));
            OBJSND[BIRD] = save.bird;