From 87452af44895728466a9a62de95a0e81863b6cfd Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 14 Nov 2018 11:43:38 -0500 Subject: [PATCH] Sync patch. --- advent.h | 2 +- make_dungeon.py | 4 ++-- saveresume.c | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/advent.h b/advent.h index e43459b..232032e 100644 --- a/advent.h +++ b/advent.h @@ -232,7 +232,7 @@ extern int restore(FILE *); extern long initialise(void); extern int action(command_t command); extern void state_change(obj_t, int); - +extern bool is_valid(struct game_t *valgame); void bug(enum bugtype, const char *) __attribute__((__noreturn__)); diff --git a/make_dungeon.py b/make_dungeon.py index 106714a..2601578 100755 --- a/make_dungeon.py +++ b/make_dungeon.py @@ -155,8 +155,8 @@ def get_objects(obj): if labels: global statedefines statedefines += "/* States for %s */\n" % item[0] - for (j, label) in enumerate(labels): - statedefines += "#define %s\t%d\n" % (label, j) + for (n, label) in enumerate(labels): + statedefines += "#define %s\t%d\n" % (label, n) statedefines += "\n" sounds_str = "" if attr.get("sounds") == None: diff --git a/saveresume.c b/saveresume.c index b03a621..7bf0c71 100644 --- a/saveresume.c +++ b/saveresume.c @@ -112,8 +112,6 @@ int resume(void) return restore(fp); } -bool is_valid(struct game_t*); - int restore(FILE* fp) { /* Read and restore game state from file, assuming -- 2.31.1