X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=saveresume.c;h=a3dbe968ebdaf4838ea2552d6c77b6e951143721;hp=a0fa8a86ffcb023b47484843dbcd2ab0eeee837e;hb=4d7858d333057850b7d4635ba51441238f0721e2;hpb=624ba16aadabdcf84a6c04ae17d0d0ff1d166835

diff --git a/saveresume.c b/saveresume.c
index a0fa8a8..a3dbe96 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -1,17 +1,17 @@
 #include <stdlib.h>
 #include <string.h>
+#include <editline/readline.h>
+#include <time.h>
 
 #include "advent.h"
-#include "database.h"
-#include "newdb.h"
-#include "linenoise/linenoise.h"
+#include "dungeon.h"
 
 /*
  * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
  * see the history.adoc file in the source distribution for discussion.
  */
 
-#define VRSION	26	/* bump on save format change */
+#define VRSION	27	/* bump on save format change */
 
 /*
  * If you change the first three members, the resume function may not properly
@@ -24,11 +24,23 @@ 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;
 
+#define IGNORE(r) do{if (r){}}while(0)
+
+int savefile(FILE *fp, long version)
+/* Save game to file. No input or output from user. */
+{
+    save.savetime = time(NULL);
+    save.mode = -1;
+    save.version = (version == 0) ? VRSION : version;
+
+    memcpy(&save.game, &game, sizeof(struct game_t));
+    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+    return (0);
+}
+
 /* Suspend and resume */
 int suspend(void)
 {
@@ -40,35 +52,27 @@ int suspend(void)
 #ifdef ADVENT_NOSAVE
     return GO_UNKNOWN;
 #endif
-    long i, k;
     FILE *fp = NULL;
 
-    RSPEAK(SUSPEND_WARNING);
-    if (!YES(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[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) {
-        char* name = linenoise("\nFile name: ");
+        char* name = readline("\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);
+        free(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];
-    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+    savefile(fp, VRSION);
     fclose(fp);
-    RSPEAK(RESUME_HELP);
-    exit(0);
+    rspeak(RESUME_HELP);
+    exit(EXIT_SUCCESS);
 }
 
 int resume(void)
@@ -81,19 +85,21 @@ int resume(void)
 #endif
     FILE *fp = NULL;
 
-    if (game.loc != 1 || game.abbrev[1] != 1) {
-        RSPEAK(RESUME_ABANDON);
-        if (!YES(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
+    if (game.loc != 1 ||
+        game.abbrev[1] != 1) {
+        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: ");
+        char* name = readline("\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);
+        free(name);
     }
 
     return restore(fp);
@@ -111,14 +117,9 @@ 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);
     }
     return GO_TOP;
 }