X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=cea0249e7d8c480ad79bb38be1285277e4141555;hp=d1ca675ade4ee756a308854482c68e99617f5355;hb=187654874c567be3a92e0b53aa1df45407432265;hpb=310781167f731177d6d46b15093dc32606eeac4e diff --git a/src/main.h b/src/main.h index d1ca675a..cea0249e 100644 --- a/src/main.h +++ b/src/main.h @@ -2359,26 +2359,28 @@ #define GFX_ARG_POST_DELAY_FIXED 39 #define GFX_ARG_POST_DELAY_RANDOM 40 #define GFX_ARG_INIT_EVENT 41 -#define GFX_ARG_ANIM_EVENT 42 -#define GFX_ARG_NAME 43 -#define GFX_ARG_SCALE_UP_FACTOR 44 -#define GFX_ARG_TILE_SIZE 45 -#define GFX_ARG_CLONE_FROM 46 -#define GFX_ARG_FADE_MODE 47 -#define GFX_ARG_FADE_DELAY 48 -#define GFX_ARG_POST_DELAY 49 -#define GFX_ARG_AUTO_DELAY 50 -#define GFX_ARG_ALIGN 51 -#define GFX_ARG_VALIGN 52 -#define GFX_ARG_SORT_PRIORITY 53 -#define GFX_ARG_CLASS 54 -#define GFX_ARG_STYLE 55 -#define GFX_ARG_ACTIVE_XOFFSET 56 -#define GFX_ARG_ACTIVE_YOFFSET 57 -#define GFX_ARG_PRESSED_XOFFSET 58 -#define GFX_ARG_PRESSED_YOFFSET 59 - -#define NUM_GFX_ARGS 60 +#define GFX_ARG_INIT_EVENT_ACTION 42 +#define GFX_ARG_ANIM_EVENT 43 +#define GFX_ARG_ANIM_EVENT_ACTION 44 +#define GFX_ARG_NAME 45 +#define GFX_ARG_SCALE_UP_FACTOR 46 +#define GFX_ARG_TILE_SIZE 47 +#define GFX_ARG_CLONE_FROM 48 +#define GFX_ARG_FADE_MODE 49 +#define GFX_ARG_FADE_DELAY 50 +#define GFX_ARG_POST_DELAY 51 +#define GFX_ARG_AUTO_DELAY 52 +#define GFX_ARG_ALIGN 53 +#define GFX_ARG_VALIGN 54 +#define GFX_ARG_SORT_PRIORITY 55 +#define GFX_ARG_CLASS 56 +#define GFX_ARG_STYLE 57 +#define GFX_ARG_ACTIVE_XOFFSET 58 +#define GFX_ARG_ACTIVE_YOFFSET 59 +#define GFX_ARG_PRESSED_XOFFSET 60 +#define GFX_ARG_PRESSED_YOFFSET 61 + +#define NUM_GFX_ARGS 62 /* values for sound configuration suffixes */ @@ -2429,16 +2431,18 @@ #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 FONT_MAIN_NETWORK_PLAYERS 42 + +#define NUM_FONTS 43 #define NUM_INITIAL_FONTS 4 /* values for toon animation configuration */ @@ -2513,10 +2517,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 +2560,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 @@ -2635,6 +2639,13 @@ struct MenuMainButtonInfo struct MenuPosInfo prev_level; struct MenuPosInfo next_level; + + struct MenuPosInfo first_level; + struct MenuPosInfo last_level; + struct MenuPosInfo level_number; + + struct MenuPosInfo insert_solution; + struct MenuPosInfo play_solution; }; struct MenuMainTextInfo @@ -2674,6 +2685,9 @@ struct MenuMainInfo struct MenuMainButtonInfo button; struct MenuMainTextInfo text; struct MenuMainInputInfo input; + + struct TextPosInfo preview_players; + struct TextPosInfo network_players; }; struct TitleFadingInfo @@ -2721,21 +2735,34 @@ struct MenuInfo int list_size[NUM_SPECIAL_GFX_ARGS]; int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; - int paragraph_spacing[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_INFO_ARGS]; - int headline1_spacing[NUM_SPECIAL_GFX_INFO_ARGS]; + int paragraph_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int headline1_spacing[NUM_SPECIAL_GFX_ARGS]; int headline1_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; - int headline1_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS]; - int headline2_spacing[NUM_SPECIAL_GFX_INFO_ARGS]; + int headline1_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int headline2_spacing[NUM_SPECIAL_GFX_ARGS]; int headline2_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; - int headline2_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS]; - int line_spacing[NUM_SPECIAL_GFX_INFO_ARGS]; + int headline2_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int line_spacing[NUM_SPECIAL_GFX_ARGS]; int line_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; - int line_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS]; - int extra_spacing[NUM_SPECIAL_GFX_INFO_ARGS]; + int line_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; + int extra_spacing[NUM_SPECIAL_GFX_ARGS]; int extra_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; - int extra_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS]; + int extra_spacing_setup[NUM_SPECIAL_GFX_SETUP_ARGS]; struct TitleFadingInfo enter_menu; struct TitleFadingInfo leave_menu; @@ -2939,11 +2966,6 @@ struct EnvelopeInfo char text[MAX_ENVELOPE_TEXT_LEN + 1]; }; -struct LevelSetInfo -{ - int music[MAX_LEVELS]; -}; - struct LevelFileInfo { int nr; @@ -3389,7 +3411,9 @@ struct GraphicInfo int post_delay_random; /* animations (pause before next animation) */ int init_event; /* optional event triggering animation start */ + int init_event_action; /* optional action called on animation start */ int anim_event; /* optional event triggering animation end */ + int anim_event_action; /* optional action called on animation end */ int step_offset; /* optional step offset of toon animations */ int step_xoffset; /* optional step offset of toon animations */ @@ -3594,7 +3618,6 @@ extern boolean network_player_action_received; extern int graphics_action_mapping[]; -extern struct LevelSetInfo levelset; extern struct LevelInfo level, level_template; extern struct HiScore highscore[]; extern struct TapeInfo tape;