X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=5692c9da39e56c5c035563ca569f860335c841db;hb=681df696173f472fe28e49b9e8e01b34dc34629b;hp=92d201946e1cba83aeef95f03d00269d968f6e60;hpb=dc51f089096a0c775d2a03d0b862a14d6ce88d51;p=rocksndiamonds.git diff --git a/src/libgame/setup.h b/src/libgame/setup.h index 92d20194..5692c9da 100644 --- a/src/libgame/setup.h +++ b/src/libgame/setup.h @@ -22,36 +22,37 @@ #define TYPE_SWITCH_3_STATES (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_PLAYER (1 << 10) -#define TYPE_ELEMENT (1 << 11) -#define TYPE_GRAPHIC (1 << 12) +#define TYPE_YES_NO_ASK (1 << 5) +#define TYPE_ECS_AGA (1 << 6) +#define TYPE_KEY (1 << 7) +#define TYPE_KEY_X11 (1 << 8) +#define TYPE_INTEGER (1 << 9) +#define TYPE_STRING (1 << 10) +#define TYPE_PLAYER (1 << 11) +#define TYPE_ELEMENT (1 << 12) +#define TYPE_GRAPHIC (1 << 13) // additional values for setup screen -#define TYPE_ENTER_SCREEN (1 << 13) -#define TYPE_LEAVE_SCREEN (1 << 14) -#define TYPE_ENTER_MENU (1 << 15) -#define TYPE_LEAVE_MENU (1 << 16) -#define TYPE_ENTER_LIST (1 << 17) -#define TYPE_LEAVE_LIST (1 << 18) -#define TYPE_TEXT_INPUT (1 << 19) -#define TYPE_EMPTY (1 << 20) -#define TYPE_SKIPPABLE (1 << 21) -#define TYPE_KEYTEXT (1 << 22) -#define TYPE_HEADLINE (1 << 23) - -#define TYPE_GHOSTED (1 << 24) -#define TYPE_QUERY (1 << 25) +#define TYPE_ENTER_SCREEN (1 << 14) +#define TYPE_LEAVE_SCREEN (1 << 15) +#define TYPE_ENTER_MENU (1 << 16) +#define TYPE_LEAVE_MENU (1 << 17) +#define TYPE_ENTER_LIST (1 << 18) +#define TYPE_LEAVE_LIST (1 << 19) +#define TYPE_TEXT_INPUT (1 << 20) +#define TYPE_EMPTY (1 << 21) +#define TYPE_SKIPPABLE (1 << 22) +#define TYPE_KEYTEXT (1 << 23) +#define TYPE_HEADLINE (1 << 24) + +#define TYPE_GHOSTED (1 << 25) +#define TYPE_QUERY (1 << 26) // additional values for internal purposes -#define TYPE_BITFIELD (1 << 26) -#define TYPE_CONTENT (1 << 27) -#define TYPE_ELEMENT_LIST (1 << 28) -#define TYPE_CONTENT_LIST (1 << 29) +#define TYPE_BITFIELD (1 << 27) +#define TYPE_CONTENT (1 << 28) +#define TYPE_ELEMENT_LIST (1 << 29) +#define TYPE_CONTENT_LIST (1 << 30) // derived values for setup file handling #define TYPE_BOOLEAN_STYLE (TYPE_BOOLEAN | \ @@ -63,6 +64,7 @@ #define TYPE_VALUE (TYPE_BOOLEAN_STYLE | \ TYPE_SWITCH_3_STATES | \ TYPE_YES_NO_AUTO | \ + TYPE_YES_NO_ASK | \ TYPE_KEY | \ TYPE_KEY_X11 | \ TYPE_INTEGER | \ @@ -277,6 +279,7 @@ char *getSetupFilename(void); char *getDefaultSetupFilename(void); char *getPlatformSetupFilename(void); char *getEditorSetupFilename(void); +char *getFilenameFromCurrentLevelDirUpward(char *); char *getHelpAnimFilename(void); char *getHelpTextFilename(void); char *getLevelSetInfoFilename(int);