Sync patch.

diff --git a/advent.h b/advent.h
index e43459bb79b888e03b8bdc0d504a8f589e191da7..232032eeea012d766320957ca429d3e03152652b 100644 (file)
--- 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 106714a9267bd519d20a8b44cb1a5e8952c591f5..260157847530b9eef0196fb7a20b6112be8dbb6e 100755 (executable)
--- 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 b03a6215c5c6d11b862add5700eb91a39e5d551e..7bf0c714c153ba5e0acf70e0b2252df858ddc7ce 100644 (file)
--- 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