X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=d688627d87903d2bc41555f757dea25c38ebfc37;hb=929d04d073dad615dfe2a2c910a0ee10c27793a4;hp=c4607c6a325951ab070d690b466b1cd68d1123f1;hpb=ad39460e7120891defad757595f1779d61fe6178;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index c4607c6a..d688627d 100644 --- a/src/main.h +++ b/src/main.h @@ -2429,16 +2429,17 @@ #define FONT_OPTION_ON 30 #define FONT_VALUE_1 31 #define FONT_VALUE_2 32 -#define FONT_VALUE_OLD 33 -#define FONT_VALUE_NARROW 34 -#define FONT_LEVEL_NUMBER_ACTIVE 35 -#define FONT_LEVEL_NUMBER 36 -#define FONT_TAPE_RECORDER 37 -#define FONT_GAME_INFO 38 -#define FONT_INFO_ELEMENTS 39 -#define FONT_INFO_LEVELSET 40 - -#define NUM_FONTS 41 +#define FONT_VALUE_OLD_NARROW 33 +#define FONT_VALUE_OLD 34 +#define FONT_VALUE_NARROW 35 +#define FONT_LEVEL_NUMBER_ACTIVE 36 +#define FONT_LEVEL_NUMBER 37 +#define FONT_TAPE_RECORDER 38 +#define FONT_GAME_INFO 39 +#define FONT_INFO_ELEMENTS 40 +#define FONT_INFO_LEVELSET 41 + +#define NUM_FONTS 42 #define NUM_INITIAL_FONTS 4 /* values for toon animation configuration */ @@ -2513,10 +2514,10 @@ /* program information and versioning definitions */ -#define PROGRAM_VERSION_MAJOR 4 +#define PROGRAM_VERSION_SUPER 4 +#define PROGRAM_VERSION_MAJOR 1 #define PROGRAM_VERSION_MINOR 0 #define PROGRAM_VERSION_PATCH 1 -#define PROGRAM_VERSION_BUILD 5 #define PROGRAM_VERSION_EXTRA "" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" @@ -2556,10 +2557,10 @@ #define GAME_VERSION_2_0 FILE_VERSION_2_0 #define GAME_VERSION_3_0 FILE_VERSION_3_0 -#define GAME_VERSION_ACTUAL VERSION_IDENT(PROGRAM_VERSION_MAJOR, \ +#define GAME_VERSION_ACTUAL VERSION_IDENT(PROGRAM_VERSION_SUPER, \ + PROGRAM_VERSION_MAJOR, \ PROGRAM_VERSION_MINOR, \ - PROGRAM_VERSION_PATCH, \ - PROGRAM_VERSION_BUILD) + PROGRAM_VERSION_PATCH) /* values for game_emulation */ #define EMU_NONE 0 @@ -2721,6 +2722,19 @@ struct MenuInfo int list_size[NUM_SPECIAL_GFX_ARGS]; int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int left_spacing[NUM_SPECIAL_GFX_ARGS]; + int left_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int left_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int right_spacing[NUM_SPECIAL_GFX_ARGS]; + int right_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int right_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int top_spacing[NUM_SPECIAL_GFX_ARGS]; + int top_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int top_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int bottom_spacing[NUM_SPECIAL_GFX_ARGS]; + int bottom_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int bottom_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int paragraph_spacing[NUM_SPECIAL_GFX_ARGS]; int paragraph_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; int paragraph_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS];