#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;
};
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.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);
}
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);
}
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);
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));