centralize calls to make_zzword()

[open-adventure.git] / saveresume.c

diff --git a/saveresume.c b/saveresume.c
index e6c0b0ab8c5218fb25b5f73380551f3707c6c86b..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;
@@ -26,6 +26,8 @@ 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. */
 {
@@ -38,7 +40,7 @@ int savefile(FILE *fp, long version)
     save.version = (version == 0) ? VRSION : version;
 
     memcpy(&save.game, &game, sizeof(struct game_t));
-    fwrite(&save, sizeof(struct save_t), 1, fp);
+    IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
     return (0);
 }
 
@@ -61,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);
@@ -93,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);
@@ -114,14 +116,12 @@ int restore(FILE* fp)
     return GO_UNKNOWN;
 #endif
 
-    fread(&save, sizeof(struct save_t), 1, fp);
+    IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
     fclose(fp);
     if (save.version != VRSION) {
         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;
 }