centralize calls to make_zzword()

[open-adventure.git] / saveresume.c

diff --git a/saveresume.c b/saveresume.c
index 3ec4ebd11b0aa1a192ea145e99c689d44295b616..49e0021b91c55f4434935774ca29d12884357f8e 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
+#include <editline/readline.h>
 
 #include "advent.h"
 #include "dungeon.h"
-#include "linenoise/linenoise.h"
 
 /*
  * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
@@ -63,13 +63,13 @@ 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);
@@ -95,13 +95,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);
@@ -122,8 +122,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;
 }