X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsetup.h;h=5ae3bc4b97c36f72e00a292c0e25859a72219405;hb=2a8b100c02ff1e102b30cb5f0e9345ba531e06c2;hp=479f88c4c482030741b7589aedeebe78696b1967;hpb=9c925fe76f2f2b3ad74251b775e938b80c81195d;p=rocksndiamonds.git diff --git a/src/libgame/setup.h b/src/libgame/setup.h index 479f88c4..5ae3bc4b 100644 --- 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 */ @@ -183,7 +185,7 @@ typedef struct hashtable SetupFileHash; ARTWORKCLASS_UNDEFINED) -void setLevelArtworkDir(TreeInfo *); +char *setLevelArtworkDir(TreeInfo *); char *getLevelFilename(int); char *getTapeFilename(int); char *getScoreFilename(int); @@ -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 *);