#include "advent.h"
#include "dungeon.h"
+/*
+ * Use this to detect endianness mismatch. Can't be unchanged by byte-swapping.
+ */
+#define ENDIAN_MAGIC 2317
+
struct save_t save;
#define IGNORE(r) do{if (r){}}while(0)
-int savefile(FILE *fp, int32_t version)
+int savefile(FILE *fp)
/* Save game to file. No input or output from user. */
{
memcpy(&save.magic, ADVENT_MAGIC, sizeof(ADVENT_MAGIC));
- save.version = (version == 0) ? SAVE_VERSION : version;
+ if (save.version == 0)
+ save.version = SAVE_VERSION;
+ if (save.canary == 0)
+ save.canary = ENDIAN_MAGIC;
save.game = game;
IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
free(name);
}
- savefile(fp, SAVE_VERSION);
+ savefile(fp);
fclose(fp);
rspeak(RESUME_HELP);
exit(EXIT_SUCCESS);
IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
fclose(fp);
- if (save.version != SAVE_VERSION) {
+ if (memcmp(save.magic, ADVENT_MAGIC, sizeof(ADVENT_MAGIC)) != 0 || save.canary != ENDIAN_MAGIC)
+ rspeak(BAD_SAVE);
+ else if (save.version != SAVE_VERSION) {
rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), SAVE_VERSION / 10, MOD(SAVE_VERSION, 10));
} else if (!is_valid(save.game)) {
rspeak(SAVE_TAMPERING);