rnd-20030730-2-src

[rocksndiamonds.git] / src / libgame / setup.h

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 9b4440334f8933226ab01e8618b23b1c66bdb20b..30952c650e9b963aa26b0d658003d56599d79af9 100644 (file)
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -26,31 +26,33 @@
 #define TYPE_KEY_X11                   (1 << 4)
 #define TYPE_INTEGER                   (1 << 5)
 #define TYPE_STRING                    (1 << 6)
+#define TYPE_TOKEN                     (1 << 7)
 
 #define TYPE_BOOLEAN_STYLE             (TYPE_BOOLEAN | \
                                         TYPE_SWITCH  | \
                                         TYPE_YES_NO)
 
 /* additional values for setup screen */
-#define TYPE_ENTER_MENU                        (1 << 7)
-#define TYPE_LEAVE_MENU                        (1 << 8)
-#define TYPE_EMPTY                     (1 << 9)
-#define TYPE_KEYTEXT                   (1 << 10)
-
-#define TYPE_GHOSTED                   (1 << 11)
-#define TYPE_QUERY                     (1 << 12)
-
-#define TYPE_VALUE                     (TYPE_BOOLEAN_STYLE | \
-                                        TYPE_KEY | \
-                                        TYPE_KEY_X11 | \
-                                        TYPE_INTEGER | \
+#define TYPE_ENTER_MENU                        (1 << 8)
+#define TYPE_LEAVE_MENU                        (1 << 9)
+#define TYPE_EMPTY                     (1 << 10)
+#define TYPE_KEYTEXT                   (1 << 11)
+
+#define TYPE_GHOSTED                   (1 << 12)
+#define TYPE_QUERY                     (1 << 13)
+
+#define TYPE_VALUE                     (TYPE_BOOLEAN_STYLE     | \
+                                        TYPE_KEY               | \
+                                        TYPE_KEY_X11           | \
+                                        TYPE_INTEGER           | \
+                                        TYPE_STRING            | \
+                                        TYPE_TOKEN)
+
+#define TYPE_SKIP_ENTRY                        (TYPE_EMPTY             | \
+                                        TYPE_KEY               | \
                                         TYPE_STRING)
 
-#define TYPE_SKIP_ENTRY                        (TYPE_EMPTY | \
-                                        TYPE_KEY | \
-                                        TYPE_STRING)
-
-#define TYPE_ENTER_OR_LEAVE_MENU       (TYPE_ENTER_MENU | \
+#define TYPE_ENTER_OR_LEAVE_MENU       (TYPE_ENTER_MENU        | \
                                         TYPE_LEAVE_MENU)
 
 /* cookie token for file identifier and version number */
@@ -193,6 +195,7 @@ char *getCustomImageFilename(char *);
 char *getCustomSoundFilename(char *);
 char *getCustomArtworkFilename(char *, int);
 char *getCustomArtworkConfigFilename(int);
+char *getCustomArtworkLevelConfigFilename(int);
 char *getCustomMusicDirectory(void);
 
 void InitTapeDirectory(char *);
@@ -227,14 +230,14 @@ boolean checkCookieString(const char *, const char *);
 
 char *getFormattedSetupEntry(char *, char *);
 
-void freeSetupFileList(struct SetupFileList *);
 struct SetupFileList *newSetupFileList(char *, char *);
+void freeSetupFileList(struct SetupFileList *);
 char *getListEntry(struct SetupFileList *, char *);
 void setListEntry(struct SetupFileList *, char *, char *);
 SetupFileList *loadSetupFileList(char *);
 
-void freeSetupFileHash(SetupFileHash *);
 SetupFileHash *newSetupFileHash();
+void freeSetupFileHash(SetupFileHash *);
 char *getHashEntry(SetupFileHash *, char *);
 void setHashEntry(SetupFileHash *, char *, char *);
 SetupFileHash *loadSetupFileHash(char *);