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

diff --git a/saveresume.c b/saveresume.c
index de3ebfe..284b8f0 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -33,14 +33,13 @@ 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);
+	if (!YES(input,200,54,54)) return GO_CLEAROBJ;
 	game.saved=game.saved+5;
     }
     else
@@ -48,17 +47,19 @@ int saveresume(FILE *input, bool resume)
 	/*  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);
+	    if (!YES(input,200,54,54)) 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;
@@ -81,13 +82,13 @@ int saveresume(FILE *input, bool resume)
 	    SETPRM(1,k/10,MOD(k,10));
 	    SETPRM(3,VRSION/10,MOD(VRSION,10));
 	    RSPEAK(269);
-	    return(2000);
+	} 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;
     }
 }