#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. */
{
FILE *fp = NULL;
rspeak(SUSPEND_WARNING);
- if (!yes(arbitrary_messages[THIS_ACCEPTABLE], arbitrary_messages[OK_MAN], arbitrary_messages[OK_MAN])) return GO_CLEAROBJ;
+ 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);
}
savefile(fp, VRSION);
fclose(fp);
rspeak(RESUME_HELP);
- exit(0);
+ exit(EXIT_SUCCESS);
}
int resume(void)
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 (!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);