X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=saveresume.c;h=088bab150a17e62f561becd19b5151d4880fa19a;hb=7eaefce61d74fbc73daabd3f42f048038366b5ad;hp=4ce219af323e7e7ebff1cea80fbfa43f524b0b07;hpb=0f15c9e0f35dbaeeebf74445ae641401fc631416;p=open-adventure.git

diff --git a/saveresume.c b/saveresume.c
index 4ce219a..088bab1 100644
--- a/saveresume.c
+++ b/saveresume.c
@@ -1,9 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
+#include <editline/readline.h>
+#include <time.h>
 
 #include "advent.h"
 #include "dungeon.h"
-#include "linenoise/linenoise.h"
 
 /*
  * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
@@ -26,15 +27,13 @@ struct save_t {
 };
 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. */
 {
-    long i, k;
-    datime(&i, &k);
-    k = i + 650 * k;
-    save.savetime = k;
+    save.savetime = time(NULL);
     save.mode = -1;
-
     save.version = (version == 0) ? VRSION : version;
 
     memcpy(&save.game, &game, sizeof(struct game_t));
@@ -61,19 +60,19 @@ int suspend(void)
     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);
     }
 
     savefile(fp, VRSION);
     fclose(fp);
     rspeak(RESUME_HELP);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 int resume(void)
@@ -93,13 +92,13 @@ int resume(void)
     }
 
     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);
@@ -120,8 +119,6 @@ int restore(FILE* fp)
         rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10));
     } else {
         memcpy(&game, &save.game, sizeof(struct game_t));
-        //game.zzword = rndvoc(3, game.zzword);
-        make_zzword(game.zzword);
     }
     return GO_TOP;
 }