archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring step - change some visibilities.

Browse source
This commit is contained in:
Eric S. Raymond 2023-04-06 17:44:11 -04:00
parent e99cc69de0
commit 3640e5cb96
2 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
advent.h
View file

@ -226,7 +226,29 @@ typedef struct {
command_state_t state; command_state_t state;
} command_t; } command_t;
/*
* Bump on save format change.
*
* Note: Verify that the tests run clean before bumping this, then rebuild the check
* files afterwards. Otherwise you will get a spurious failure due to the old version
* having been generated into a check file.
*/
#define SAVE_VERSION 29
/*
* If you change the first three members, the resume function may not properly
* reject saves from older versions. Later members can change, but bump the version
* when you do that.
*/
struct save_t {
int64_t savetime;
int32_t mode; /* not used, must be present for version detection */
int32_t version;
struct game_t game;
};
extern struct game_t game; extern struct game_t game;
extern struct save_t save;
extern struct settings_t settings; extern struct settings_t settings;
extern char *myreadline(const char *); extern char *myreadline(const char *);
@ -262,8 +284,7 @@ extern int initialise(void);
extern phase_codes_t action(command_t); extern phase_codes_t action(command_t);
extern void state_change(obj_t, int); extern void state_change(obj_t, int);
extern bool is_valid(struct game_t); extern bool is_valid(struct game_t);
extern void bug(enum bugtype, const char *) __attribute__((__noreturn__));
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
/* represent an empty command word */ /* represent an empty command word */
static const command_word_t empty_command_word = { static const command_word_t empty_command_word = {

28
saveresume.c
View file

@ -18,26 +18,6 @@
#include "advent.h" #include "advent.h"
#include "dungeon.h" #include "dungeon.h"
/*
* Bump on save format change.
*
* Note: Verify that the tests run clean before bumping this, then rebuild the check
* files afterwards. Otherwise you will get a spurious failure due to the old version
* having been generated into a check file.
*/
#define VRSION 29
/*
* If you change the first three members, the resume function may not properly
* reject saves from older versions. Later members can change, but bump the version
* when you do that.
*/
struct save_t {
int64_t savetime;
int32_t mode; /* not used, must be present for version detection */
int32_t version;
struct game_t game;
};
struct save_t save; struct save_t save;
#define IGNORE(r) do{if (r){}}while(0) #define IGNORE(r) do{if (r){}}while(0)
@ -47,7 +27,7 @@ int savefile(FILE *fp, int32_t version)
{ {
save.savetime = time(NULL); save.savetime = time(NULL);
save.mode = -1; save.mode = -1;
save.version = (version == 0) ? VRSION : version; save.version = (version == 0) ? SAVE_VERSION : version;
save.game = game; save.game = game;
IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp)); IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
@ -105,7 +85,7 @@ int suspend(void)
free(name); free(name);
} }
savefile(fp, VRSION); savefile(fp, SAVE_VERSION);
fclose(fp); fclose(fp);
rspeak(RESUME_HELP); rspeak(RESUME_HELP);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -156,8 +136,8 @@ int restore(FILE* fp)
IGNORE(fread(&save, sizeof(struct save_t), 1, fp)); IGNORE(fread(&save, sizeof(struct save_t), 1, fp));
fclose(fp); fclose(fp);
if (save.version != VRSION) { if (save.version != SAVE_VERSION) {
rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10)); rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), SAVE_VERSION / 10, MOD(SAVE_VERSION, 10));
} else if (!is_valid(save.game)) { } else if (!is_valid(save.game)) {
rspeak(SAVE_TAMPERING); rspeak(SAVE_TAMPERING);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);