Sync patch.

This commit is contained in:
Eric S. Raymond 2018-11-14 11:43:38 -05:00
parent 25765a1b0f
commit 87452af448
3 changed files with 3 additions and 5 deletions

View file

@ -232,7 +232,7 @@ extern int restore(FILE *);
extern long initialise(void); extern long initialise(void);
extern int action(command_t command); extern int action(command_t command);
extern void state_change(obj_t, int); extern void state_change(obj_t, int);
extern bool is_valid(struct game_t *valgame);
void bug(enum bugtype, const char *) __attribute__((__noreturn__)); void bug(enum bugtype, const char *) __attribute__((__noreturn__));

View file

@ -155,8 +155,8 @@ def get_objects(obj):
if labels: if labels:
global statedefines global statedefines
statedefines += "/* States for %s */\n" % item[0] statedefines += "/* States for %s */\n" % item[0]
for (j, label) in enumerate(labels): for (n, label) in enumerate(labels):
statedefines += "#define %s\t%d\n" % (label, j) statedefines += "#define %s\t%d\n" % (label, n)
statedefines += "\n" statedefines += "\n"
sounds_str = "" sounds_str = ""
if attr.get("sounds") == None: if attr.get("sounds") == None:

View file

@ -112,8 +112,6 @@ int resume(void)
return restore(fp); return restore(fp);
} }
bool is_valid(struct game_t*);
int restore(FILE* fp) int restore(FILE* fp)
{ {
/* Read and restore game state from file, assuming /* Read and restore game state from file, assuming