X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=88577ac27add45a3315bb7ee3e06e5d825640b5b;hp=4ae3c627eb648f0d11f1e49f8f66920b9578b05c;hb=914d869445048466ef00954109a15286938521c6;hpb=f999c2cc67c71aacefe65d40d06834d8af854137 diff --git a/src/main.h b/src/main.h index 4ae3c627..88577ac2 100644 --- a/src/main.h +++ b/src/main.h @@ -2370,10 +2370,13 @@ enum GFX_ARG_DRAW_ORDER, GFX_ARG_INIT_DELAY_FIXED, GFX_ARG_INIT_DELAY_RANDOM, + GFX_ARG_INIT_DELAY_ACTION, GFX_ARG_ANIM_DELAY_FIXED, GFX_ARG_ANIM_DELAY_RANDOM, + GFX_ARG_ANIM_DELAY_ACTION, GFX_ARG_POST_DELAY_FIXED, GFX_ARG_POST_DELAY_RANDOM, + GFX_ARG_POST_DELAY_ACTION, GFX_ARG_INIT_EVENT, GFX_ARG_INIT_EVENT_ACTION, GFX_ARG_ANIM_EVENT, @@ -2386,6 +2389,7 @@ enum GFX_ARG_FADE_DELAY, GFX_ARG_POST_DELAY, GFX_ARG_AUTO_DELAY, + GFX_ARG_AUTO_DELAY_UNIT, GFX_ARG_ALIGN, GFX_ARG_VALIGN, GFX_ARG_SORT_PRIORITY, @@ -2544,7 +2548,7 @@ enum // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 #define PROGRAM_VERSION_MAJOR 1 -#define PROGRAM_VERSION_MINOR 2 +#define PROGRAM_VERSION_MINOR 3 #define PROGRAM_VERSION_PATCH 1 #define PROGRAM_VERSION_EXTRA "" @@ -2715,12 +2719,24 @@ struct MenuMainInfo struct TextPosInfo network_players; }; +struct MenuSetupButtonInfo +{ + struct MenuPosInfo prev_player; + struct MenuPosInfo next_player; +}; + +struct MenuSetupInfo +{ + struct MenuSetupButtonInfo button; +}; + struct TitleFadingInfo { int fade_mode; int fade_delay; int post_delay; int auto_delay; + int auto_delay_unit; }; struct TitleMessageInfo @@ -2739,6 +2755,7 @@ struct TitleMessageInfo int fade_delay; int post_delay; int auto_delay; + int auto_delay_unit; }; struct InitInfo @@ -2801,6 +2818,7 @@ struct MenuInfo int music[NUM_SPECIAL_GFX_ARGS]; struct MenuMainInfo main; + struct MenuSetupInfo setup; }; struct DoorInfo @@ -3412,6 +3430,18 @@ struct GlobalAnimInfo int music[NUM_GLOBAL_ANIM_PARTS_ALL][NUM_SPECIAL_GFX_ARGS]; }; +struct GlobalAnimEventListInfo +{ + int *event_value; + int num_event_values; +}; + +struct GlobalAnimEventInfo +{ + struct GlobalAnimEventListInfo **event_list; + int num_event_lists; +}; + struct GraphicInfo { Bitmap **bitmaps; // bitmaps in all required sizes @@ -3449,10 +3479,13 @@ struct GraphicInfo int init_delay_fixed; // optional initial delay values for global int init_delay_random; // animations (pause interval before start) + int init_delay_action; // optional action called on animation start int anim_delay_fixed; // optional delay values for bored/sleeping int anim_delay_random; // and global animations (animation length) + int anim_delay_action; // optional action called on animation end int post_delay_fixed; // optional delay values after bored/global int post_delay_random; // animations (pause before next animation) + int post_delay_action; // optional action called after post delay int init_event; // optional event triggering animation start int init_event_action; // optional action called on animation start @@ -3478,6 +3511,7 @@ struct GraphicInfo int fade_delay; // optional setting for drawing title screens int post_delay; // optional setting for drawing title screens int auto_delay; // optional setting for drawing title screens + int auto_delay_unit; // optional setting for drawing title screens int align, valign; // optional setting for drawing title screens int sort_priority; // optional setting for drawing title screens @@ -3701,6 +3735,7 @@ extern struct TokenIntPtrInfo image_config_vars[]; extern struct FontInfo font_info[]; extern struct GlobalAnimInfo global_anim_info[]; extern struct GlobalAnimNameInfo global_anim_name_info[]; +extern struct GlobalAnimEventInfo global_anim_event_info; extern struct MusicPrefixInfo music_prefix_info[]; extern struct GraphicInfo *graphic_info; extern struct SoundInfo *sound_info;