X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=11ee9c0fb79ee6465a938610c3e75778abaeffe9;hb=2f8bd98e428f73379a9173ccc9f7d03c885d641a;hp=6d80a9b225ffbbcbc24947a391e0591e30d5e826;hpb=0868de4751d9e3d4b2f3185c52edb5569217d39a;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 6d80a9b2..11ee9c0f 100644 --- a/src/main.h +++ b/src/main.h @@ -1720,8 +1720,8 @@ /* values for special image configuration suffixes (must match game mode) */ #define GFX_SPECIAL_ARG_DEFAULT 0 -#define GFX_SPECIAL_ARG_TITLE 1 -#define GFX_SPECIAL_ARG_MESSAGE 2 +#define GFX_SPECIAL_ARG_TITLE_INITIAL 1 +#define GFX_SPECIAL_ARG_TITLE 2 #define GFX_SPECIAL_ARG_MAIN 3 #define GFX_SPECIAL_ARG_LEVELS 4 #define GFX_SPECIAL_ARG_SCORES 5 @@ -1869,8 +1869,8 @@ /* values for game_status (must match special image configuration suffixes) */ #define GAME_MODE_DEFAULT 0 -#define GAME_MODE_TITLE 1 -#define GAME_MODE_MESSAGE 2 +#define GAME_MODE_TITLE_INITIAL 1 +#define GAME_MODE_TITLE 2 #define GAME_MODE_MAIN 3 #define GAME_MODE_LEVELS 4 #define GAME_MODE_SCORES 5 @@ -2047,15 +2047,12 @@ struct MenuMainInfo struct MenuMainInputInfo input; }; -struct TitleInfo +struct TitleFadingInfo { + int anim_mode; int fade_delay; int post_delay; int auto_delay; - - int fade_delay_final; - int post_delay_final; - int auto_delay_final; }; struct TitleMessageInfo @@ -2067,8 +2064,13 @@ struct TitleMessageInfo int font; boolean autowrap; boolean centered; - boolean skip_comments; + boolean parse_comments; int sort_priority; + + int anim_mode; + int fade_delay; + int post_delay; + int auto_delay; }; struct MenuInfo @@ -2082,9 +2084,8 @@ struct MenuInfo int list_size[NUM_SPECIAL_GFX_ARGS]; - int fade_delay; - int post_delay; - int auto_delay; + struct TitleFadingInfo navigation; + struct TitleFadingInfo destination; int sound[NUM_SPECIAL_GFX_ARGS]; int music[NUM_SPECIAL_GFX_ARGS]; @@ -2684,8 +2685,12 @@ extern struct HiScore highscore[]; extern struct TapeInfo tape; extern struct GlobalInfo global; extern struct BorderInfo border; -extern struct TitleInfo title; +extern struct TitleFadingInfo fading; +extern struct TitleFadingInfo title_initial_default; +extern struct TitleFadingInfo title_default; +extern struct TitleMessageInfo titlemessage_initial_default; extern struct TitleMessageInfo titlemessage_initial[]; +extern struct TitleMessageInfo titlemessage_default; extern struct TitleMessageInfo titlemessage[]; extern struct TitleMessageInfo readme; extern struct MenuInfo menu;