X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=02a815ab8c02edbf8bf7fbfc8a909664ef03e52b;hb=30f635b58c076871cee2630ce15ffd7019764b2e;hp=55440806ab4592f26d810f9bf261a30bf3c9374e;hpb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;p=rocksndiamonds.git diff --git a/src/libgame/setup.h b/src/libgame/setup.h index 55440806..02a815ab 100644 --- a/src/libgame/setup.h +++ b/src/libgame/setup.h @@ -27,24 +27,24 @@ #define TYPE_KEY_X11 (1 << 5) #define TYPE_INTEGER (1 << 6) #define TYPE_STRING (1 << 7) -#define TYPE_TOKEN (1 << 8) +#define TYPE_ELEMENT (1 << 8) +#define TYPE_GRAPHIC (1 << 9) /* 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 << 10) +#define TYPE_LEAVE_SCREEN (1 << 11) +#define TYPE_ENTER_MENU (1 << 12) +#define TYPE_LEAVE_MENU (1 << 13) +#define TYPE_ENTER_LIST (1 << 14) +#define TYPE_LEAVE_LIST (1 << 15) +#define TYPE_EMPTY (1 << 16) +#define TYPE_KEYTEXT (1 << 17) + +#define TYPE_GHOSTED (1 << 18) +#define TYPE_QUERY (1 << 19) /* additional values for internal purposes */ -#define TYPE_BITFIELD (1 << 19) -#define TYPE_ELEMENT (1 << 20) +#define TYPE_BITFIELD (1 << 20) #define TYPE_CONTENT (1 << 21) #define TYPE_ELEMENT_LIST (1 << 22) #define TYPE_CONTENT_LIST (1 << 23) @@ -61,7 +61,8 @@ TYPE_KEY_X11 | \ TYPE_INTEGER | \ TYPE_STRING | \ - TYPE_TOKEN) + TYPE_ELEMENT | \ + TYPE_GRAPHIC) #define TYPE_SKIP_ENTRY (TYPE_EMPTY | \ TYPE_KEY | \ @@ -230,6 +231,7 @@ char *getEditorSetupFilename(void); char *getHelpAnimFilename(void); char *getHelpTextFilename(void); char *getLevelSetInfoFilename(void); +char *getLevelSetTitleMessageFilename(int, boolean); char *getImageFilename(char *); char *getCustomImageFilename(char *); char *getCustomSoundFilename(char *); @@ -280,6 +282,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 *);