X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=2884232cb96956421e990c0dd380b4d5aac7f876;hb=4994dc8d46ba4fe85e77aa3067dd186a023225c6;hp=e55f4c191330beaf0fee4ab2068d41910972f8ff;hpb=b270fc80ba831c22d288ce68c2dde728c97d2333;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index e55f4c19..2884232c 100644 --- a/src/main.h +++ b/src/main.h @@ -1838,10 +1838,12 @@ #define GFX_SPECIAL_ARG_SUBMENU 29 #define GFX_SPECIAL_ARG_MENU 30 #define GFX_SPECIAL_ARG_TOONS 31 -#define GFX_SPECIAL_ARG_FADING 32 -#define GFX_SPECIAL_ARG_QUIT 33 +#define GFX_SPECIAL_ARG_SCORESOLD 32 +#define GFX_SPECIAL_ARG_SCORESNEW 33 +#define GFX_SPECIAL_ARG_FADING 34 +#define GFX_SPECIAL_ARG_QUIT 35 -#define NUM_SPECIAL_GFX_ARGS 34 +#define NUM_SPECIAL_GFX_ARGS 36 /* these additional definitions are currently only used for draw offsets */ #define GFX_SPECIAL_ARG_INFO_MAIN 0 @@ -2058,10 +2060,12 @@ #define GAME_MODE_PSEUDO_SUBMENU 29 #define GAME_MODE_PSEUDO_MENU 30 #define GAME_MODE_PSEUDO_TOONS 31 -#define GAME_MODE_PSEUDO_FADING 32 -#define GAME_MODE_QUIT 33 +#define GAME_MODE_PSEUDO_SCORESOLD 32 +#define GAME_MODE_PSEUDO_SCORESNEW 33 +#define GAME_MODE_PSEUDO_FADING 34 +#define GAME_MODE_QUIT 35 -#define NUM_GAME_MODES 34 +#define NUM_GAME_MODES 36 /* special definitions currently only used for custom artwork configuration */ #define MUSIC_PREFIX_BACKGROUND 0 @@ -2075,7 +2079,7 @@ /* program information and versioning definitions */ #define PROGRAM_VERSION_MAJOR 4 #define PROGRAM_VERSION_MINOR 0 -#define PROGRAM_VERSION_PATCH 0 +#define PROGRAM_VERSION_PATCH 1 #define PROGRAM_VERSION_BUILD 2 #define PROGRAM_VERSION_EXTRA "" @@ -2645,6 +2649,7 @@ struct GlobalInfo int num_toons; float frames_per_second; + boolean show_frames_per_second; /* global values for fading screens and masking borders */ int border_status; @@ -3176,6 +3181,7 @@ extern SetupFileHash *image_config_hash; extern SetupFileHash *element_token_hash; extern SetupFileHash *graphic_token_hash; extern SetupFileHash *font_token_hash; +extern SetupFileHash *hide_setup_hash; extern struct ConfigTypeInfo image_config_suffix[]; extern struct ConfigTypeInfo sound_config_suffix[]; extern struct ConfigTypeInfo music_config_suffix[];