#include <stdlib.h>
#include <string.h>
+#include <editline/readline.h>
#include "advent.h"
-#include "database.h"
-#include "newdb.h"
-#include "linenoise/linenoise.h"
+#include "dungeon.h"
/*
* (ESR) This replaces a bunch of particularly nasty FORTRAN-derived code;
long mode; /* not used, must be present for version detection */
long version;
struct game_t game;
- long bird;
- long bivalve;
};
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.mode = -1;
+
+ save.version = (version == 0) ? VRSION : version;
+
+ memcpy(&save.game, &game, sizeof(struct game_t));
+ IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+ return (0);
+}
+
/* Suspend and resume */
int suspend(void)
{
#ifdef ADVENT_NOSAVE
return GO_UNKNOWN;
#endif
- long i, k;
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);
}
- DATIME(&i, &k);
- k = i + 650 * k;
- save.savetime = k;
- save.mode = -1;
- save.version = VRSION;
- memcpy(&save.game, &game, sizeof(struct game_t));
- save.bird = OBJSND[BIRD];
- save.bivalve = OBJTXT[OYSTER];
- IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
+ 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);
rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10));
} else {
memcpy(&game, &save.game, sizeof(struct game_t));
- OBJSND[BIRD] = save.bird;
- OBJTXT[OYSTER] = save.bivalve;
- game.zzword = RNDVOC(3, game.zzword);
+ //game.zzword = rndvoc(3, game.zzword);
+ make_zzword(game.zzword);
}
return GO_TOP;
}