X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=33725179f04d35d79bd0d625776c6cf72d81be47;hb=c9308ba3e7ddea2d7e44b4d98f0dfbb19e18f04f;hp=da76f7df76c26d96fc22ea35d9db4d97e2300635;hpb=b903ee03857c26c3816a37b4c7c858c24250a7ef;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index da76f7df..33725179 100644 --- a/src/main.h +++ b/src/main.h @@ -75,6 +75,7 @@ ((x) >= (xmin) && (x) <= (xmax) && \ (y) >= (ymin) && (y) <= (ymax)) +#define IN_PIX_FIELD(x, y) IN_FIELD(x, y, SXSIZE, SYSIZE) #define IN_VIS_FIELD(x, y) IN_FIELD(x, y, SCR_FIELDX, SCR_FIELDY) #define IN_LEV_FIELD(x, y) IN_FIELD(x, y, lev_fieldx, lev_fieldy) #define IN_SCR_FIELD(x, y) IN_FIELD_MINMAX(x,y, BX1,BY1, BX2,BY2) @@ -2720,6 +2721,22 @@ 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 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 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 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 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 extra_spacing_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int extra_spacing_setup[NUM_SPECIAL_GFX_INFO_ARGS]; + struct TitleFadingInfo enter_menu; struct TitleFadingInfo leave_menu; struct TitleFadingInfo enter_screen[NUM_SPECIAL_GFX_ARGS]; @@ -2749,6 +2766,7 @@ struct DoorInfo int height; int step_offset; int step_delay; + int post_delay; int anim_mode; }; @@ -2800,6 +2818,8 @@ struct EditorSettingsInfo struct XY element_name; struct EditorTabsInfo tabs; + + struct XY tooltip; }; struct EditorGadgetInfo @@ -3061,6 +3081,9 @@ struct LevelInfo boolean mm_laser_red, mm_laser_green, mm_laser_blue; boolean df_laser_red, df_laser_green, df_laser_blue; int mm_time_fuse; + int mm_time_bomb; + int mm_time_ball; + int mm_time_block; /* ('int' instead of 'boolean' because used as selectbox value in editor) */ int use_step_counter; /* count steps instead of seconds for level */