rnd-20100325-1-src

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

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 6dc15e9cdf4c767d54058745fa7e819d8695598a..b0b6a8d2dfbc998fda2d1f85082a7caed3d0f412 100644 (file)
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -21,33 +21,35 @@
 /* values for setup file handling */
 #define TYPE_BOOLEAN                   (1 << 0)
 #define TYPE_SWITCH                    (1 << 1)
-#define TYPE_YES_NO                    (1 << 2)
-#define TYPE_ECS_AGA                   (1 << 3)
-#define TYPE_KEY                       (1 << 4)
-#define TYPE_KEY_X11                   (1 << 5)
-#define TYPE_INTEGER                   (1 << 6)
-#define TYPE_STRING                    (1 << 7)
-#define TYPE_TOKEN                     (1 << 8)
+#define TYPE_SWITCH3                   (1 << 2)
+#define TYPE_YES_NO                    (1 << 3)
+#define TYPE_YES_NO_AUTO               (1 << 4)
+#define TYPE_ECS_AGA                   (1 << 5)
+#define TYPE_KEY                       (1 << 6)
+#define TYPE_KEY_X11                   (1 << 7)
+#define TYPE_INTEGER                   (1 << 8)
+#define TYPE_STRING                    (1 << 9)
+#define TYPE_ELEMENT                   (1 << 10)
+#define TYPE_GRAPHIC                   (1 << 11)
 
 /* additional values for setup screen */
-#define TYPE_ENTER_SCREEN              (1 << 9)
-#define TYPE_LEAVE_SCREEN              (1 << 10)
-#define TYPE_ENTER_MENU                        (1 << 11)
-#define TYPE_LEAVE_MENU                        (1 << 12)
-#define TYPE_ENTER_LIST                        (1 << 13)
-#define TYPE_LEAVE_LIST                        (1 << 14)
-#define TYPE_EMPTY                     (1 << 15)
-#define TYPE_KEYTEXT                   (1 << 16)
-
-#define TYPE_GHOSTED                   (1 << 17)
-#define TYPE_QUERY                     (1 << 18)
+#define TYPE_ENTER_SCREEN              (1 << 12)
+#define TYPE_LEAVE_SCREEN              (1 << 13)
+#define TYPE_ENTER_MENU                        (1 << 14)
+#define TYPE_LEAVE_MENU                        (1 << 15)
+#define TYPE_ENTER_LIST                        (1 << 16)
+#define TYPE_LEAVE_LIST                        (1 << 17)
+#define TYPE_EMPTY                     (1 << 18)
+#define TYPE_KEYTEXT                   (1 << 19)
+
+#define TYPE_GHOSTED                   (1 << 20)
+#define TYPE_QUERY                     (1 << 21)
 
 /* additional values for internal purposes */
-#define TYPE_BITFIELD                  (1 << 19)
-#define TYPE_ELEMENT                   (1 << 20)
-#define TYPE_CONTENT                   (1 << 21)
-#define TYPE_ELEMENT_LIST              (1 << 22)
-#define TYPE_CONTENT_LIST              (1 << 23)
+#define TYPE_BITFIELD                  (1 << 22)
+#define TYPE_CONTENT                   (1 << 23)
+#define TYPE_ELEMENT_LIST              (1 << 24)
+#define TYPE_CONTENT_LIST              (1 << 25)
 
 /* derived values for setup file handling */
 #define TYPE_BOOLEAN_STYLE             (TYPE_BOOLEAN | \
@@ -57,11 +59,14 @@
 
 /* derived values for setup screen */
 #define TYPE_VALUE                     (TYPE_BOOLEAN_STYLE     | \
+                                        TYPE_SWITCH3           | \
+                                        TYPE_YES_NO_AUTO       | \
                                         TYPE_KEY               | \
                                         TYPE_KEY_X11           | \
                                         TYPE_INTEGER           | \
                                         TYPE_STRING            | \
-                                        TYPE_TOKEN)
+                                        TYPE_ELEMENT           | \
+                                        TYPE_GRAPHIC)
 
 #define TYPE_SKIP_ENTRY                        (TYPE_EMPTY             | \
                                         TYPE_KEY               | \
@@ -230,7 +235,7 @@ char *getEditorSetupFilename(void);
 char *getHelpAnimFilename(void);
 char *getHelpTextFilename(void);
 char *getLevelSetInfoFilename(void);
-char *getLevelSetMessageFilename(void);
+char *getLevelSetTitleMessageFilename(int, boolean);
 char *getImageFilename(char *);
 char *getCustomImageFilename(char *);
 char *getCustomSoundFilename(char *);
@@ -281,6 +286,8 @@ boolean checkCookieString(const char *, const char *);
 
 char *getFormattedSetupEntry(char *, char *);
 
+boolean getTokenValueFromSetupLine(char *, char **, char **);
+
 SetupFileList *newSetupFileList(char *, char *);
 void freeSetupFileList(SetupFileList *);
 char *getListEntry(SetupFileList *, char *);
@@ -299,6 +306,8 @@ void setSetupInfo(struct TokenInfo *, int, char *);
 char *getSetupValue(int, void *);
 char *getSetupLine(struct TokenInfo *, char *, int);
 
+unsigned int get_hash_from_key(void *);
+
 boolean AdjustGraphicsForEMC();
 
 void LoadLevelInfo(void);