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

Moved application settings to settings_t struct

Browse source 
Since logfp, oldstyle, and prompt were application settings, rather than
have them all as global vars, move them to a single global var, seperate
from game state, as they aren't, technically, game state, but are
application settings.
This commit is contained in:
Aaron Traas 2017-07-02 02:46:04 -04:00 • committed by Eric S. Raymond
parent d23111daba
commit 7eaefce61d
5 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
advent.h
View file

@ -163,6 +163,16 @@ struct game_t {
long prop[NOBJECTS + 1];
};
/*
* Game application settings - settings, but not state of the game, per se.
* This data is not saved in a saved game.
*/
struct settings_t {
FILE *logfp;
bool oldstyle;
bool prompt;
};
struct command_t {
enum speechpart part;
vocab_t verb;
@ -172,8 +182,7 @@ struct command_t {
};
extern struct game_t game;
extern FILE *logfp;
extern bool oldstyle, prompt;
extern struct settings_t settings;
extern char* xstrdup(const char* s);
extern void* xmalloc(size_t size);
@ -218,7 +227,6 @@ extern int restore(FILE *);
extern long initialise(void);
extern int action(struct command_t *command);
/* Alas, declaring this static confuses the coverage analyzer */
void bug(enum bugtype, const char *) __attribute__((__noreturn__));
/* end */