X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=19e65e1274a0f5b9ddb0db29febe9e7dbf90dc94;hp=de3ebfe7980ed1c36121fa0a127e02be84b8e984;hb=e34bd8acf631dd609b4b05252df3a1ea49e24c9b;hpb=9e8e0893dc3eb3b17b09ba5d7252461bb870ccc6

diff --git a/saveresume.c b/saveresume.c
index de3ebfe..19e65e1 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -3,6 +3,7 @@
 
 #include "advent.h"
 #include "database.h"
+#include "newdb.h"
 #include "linenoise/linenoise.h"
 
 /*
@@ -33,32 +34,33 @@ 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(2012);
+	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(2012);
+	    RSPEAK(RESUME_ABANDON);
+	    if (!YES(input,THIS_ACCEPTABLE,OK_MAN,OK_MAN)) return GO_CLEAROBJ;
 	}
     }
 
     while (fp == NULL) {
-	name = linenoise("File name: ");
+	char* name = linenoise("\nFile name: ");
+	if (name == NULL)
+	    return GO_TOP;
 	fp = fopen(name,(resume ? READ_MODE : WRITE_MODE));
 	if (fp == NULL)
 	    printf("Can't open file %s, try again.\n", name); 
+	linenoiseFree(name);
     }
-    linenoiseFree(name);
     
     DATIME(&i,&k);
     k=i+650*k;
@@ -72,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));
@@ -80,14 +82,14 @@ 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);
-	    return(2000);
+	    RSPEAK(VERSION_SKEW);
+	} else {
+	    memcpy(&game, &save.game, sizeof(struct game_t));
+	    OBJSND[BIRD] = save.bird;
+	    OBJTXT[OYSTER] = save.bivalve;
+	    game.zzword=RNDVOC(3,game.zzword);
 	}
-	memcpy(&game, &save.game, sizeof(struct game_t));
-	OBJSND[BIRD] = save.bird;
-	OBJTXT[OYSTER] = save.bivalve;
-	game.zzword=RNDVOC(3,game.zzword);
-	return(2000);
+	return GO_TOP;
     }
 }