X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=c7088fefc0c1dfb4ba28219fa4532e114d7cf487;hp=b535fed953f1dd34de643eb4a5706a86630ceca3;hb=cdb1ab45edf8771b961049cf15da337aa8c4528a;hpb=8b8ea53b13db11272139e2bd2fa62877ff0d32ec diff --git a/src/main.h b/src/main.h index b535fed9..c7088fef 100644 --- a/src/main.h +++ b/src/main.h @@ -680,17 +680,38 @@ #define IS_DF_ELEMENT(e) ((e) >= EL_DF_START && \ (e) <= EL_DF_END) +#define IS_MM_MCDUFFIN(e) ((e) >= EL_MM_MCDUFFIN_START && \ + (e) <= EL_MM_MCDUFFIN_END) + +#define IS_DF_LASER(e) ((e) >= EL_DF_LASER_START && \ + (e) <= EL_DF_LASER_END) + #define IS_MM_WALL(e) (((e) >= EL_MM_WALL_START && \ (e) <= EL_MM_WALL_END) || \ ((e) >= EL_DF_WALL_START && \ (e) <= EL_DF_WALL_END)) -#define IS_DF_WALL(e) (((e) >= EL_DF_WALL_START && \ - (e) <= EL_DF_WALL_END)) +#define IS_DF_WALL(e) ((e) >= EL_DF_WALL_START && \ + (e) <= EL_DF_WALL_END) + +#define IS_MM_WALL_EDITOR(e) ((e) == EL_MM_STEEL_WALL || \ + (e) == EL_MM_WOODEN_WALL || \ + (e) == EL_MM_ICE_WALL || \ + (e) == EL_MM_AMOEBA_WALL || \ + (e) == EL_DF_STEEL_WALL || \ + (e) == EL_DF_WOODEN_WALL) #define IS_ENVELOPE(e) ((e) >= EL_ENVELOPE_1 && \ (e) <= EL_ENVELOPE_4) +#define IS_BALLOON_ELEMENT(e) ((e) == EL_BALLOON || \ + (e) == EL_BALLOON_SWITCH_LEFT || \ + (e) == EL_BALLOON_SWITCH_RIGHT || \ + (e) == EL_BALLOON_SWITCH_UP || \ + (e) == EL_BALLOON_SWITCH_DOWN || \ + (e) == EL_BALLOON_SWITCH_ANY || \ + (e) == EL_BALLOON_SWITCH_NONE) + #define IS_RND_KEY(e) ((e) >= EL_KEY_1 && \ (e) <= EL_KEY_4) #define IS_EM_KEY(e) ((e) >= EL_EM_KEY_1 && \ @@ -777,6 +798,9 @@ #define IS_DC_STEELWALL_2(e) ((e) >= EL_DC_STEELWALL_2_LEFT && \ (e) <= EL_DC_STEELWALL_2_SINGLE) +#define MM_WALL_BASE(e) ((e) & 0xfff0) +#define MM_WALL_BITS(e) ((e) & 0x000f) + #define GFX_ELEMENT(e) (element_info[e].gfx_element) /* !!! CHECK THIS !!! */ @@ -984,7 +1008,7 @@ #define SC_CRYSTAL 11 #define SC_PEARL 12 #define SC_SHIELD 13 -#define SC_UNKNOWN_14 14 +#define SC_ELEM_BONUS 14 #define SC_UNKNOWN_15 15 #define LEVEL_SCORE_ELEMENTS 16 /* level elements with score */ @@ -1546,18 +1570,22 @@ #define EL_MM_WALL_EMPTY EL_MM_WALL_START #define EL_MM_WALL_00 EL_MM_WALL_START #define EL_MM_STEEL_WALL_START EL_MM_WALL_00 +#define EL_MM_STEEL_WALL_1 EL_MM_STEEL_WALL_START #define EL_MM_WALL_15 (EL_MM_START + 47) #define EL_MM_STEEL_WALL_END EL_MM_WALL_15 #define EL_MM_WALL_16 (EL_MM_START + 48) #define EL_MM_WOODEN_WALL_START EL_MM_WALL_16 +#define EL_MM_WOODEN_WALL_1 EL_MM_WOODEN_WALL_START #define EL_MM_WALL_31 (EL_MM_START + 63) #define EL_MM_WOODEN_WALL_END EL_MM_WALL_31 #define EL_MM_WALL_32 (EL_MM_START + 64) #define EL_MM_ICE_WALL_START EL_MM_WALL_32 +#define EL_MM_ICE_WALL_1 EL_MM_ICE_WALL_START #define EL_MM_WALL_47 (EL_MM_START + 79) #define EL_MM_ICE_WALL_END EL_MM_WALL_47 #define EL_MM_WALL_48 (EL_MM_START + 80) #define EL_MM_AMOEBA_WALL_START EL_MM_WALL_48 +#define EL_MM_AMOEBA_WALL_1 EL_MM_AMOEBA_WALL_START #define EL_MM_WALL_63 (EL_MM_START + 95) #define EL_MM_AMOEBA_WALL_END EL_MM_WALL_63 #define EL_MM_WALL_END EL_MM_WALL_63 @@ -1634,8 +1662,13 @@ #define EL_MM_WOODEN_GRID_FIXED_END EL_MM_WOODEN_GRID_FIXED_03 #define EL_MM_FUEL_EMPTY (EL_MM_START + 155) -#define EL_MM_END_1 (EL_MM_START + 155) -#define EL_MM_START_2 (EL_MM_START + 156) +#define EL_MM_UNUSED_156 (EL_MM_START + 156) +#define EL_MM_UNUSED_157 (EL_MM_START + 157) +#define EL_MM_UNUSED_158 (EL_MM_START + 158) +#define EL_MM_UNUSED_159 (EL_MM_START + 159) + +#define EL_MM_END_1 (EL_MM_START + 159) +#define EL_MM_START_2 (EL_MM_START + 160) #define EL_DF_START EL_MM_START_2 #define EL_DF_START2 (EL_DF_START - 240) @@ -1682,9 +1715,11 @@ #define EL_DF_STEEL_GRID_FIXED_END EL_DF_STEEL_GRID_FIXED_07 #define EL_DF_WOODEN_WALL_START (EL_DF_START2 + 272) +#define EL_DF_WOODEN_WALL_1 (EL_DF_WOODEN_WALL_START + 0) #define EL_DF_WOODEN_WALL_END (EL_DF_WOODEN_WALL_START + 15) #define EL_DF_STEEL_WALL_START (EL_DF_START2 + 288) +#define EL_DF_STEEL_WALL_1 (EL_DF_STEEL_WALL_START + 0) #define EL_DF_STEEL_WALL_END (EL_DF_STEEL_WALL_START + 15) #define EL_DF_WALL_START EL_DF_WOODEN_WALL_START @@ -1836,22 +1871,22 @@ #define EL_MM_BEAMER_BLUE_16 (EL_MM_BEAMER_BLUE_START + 15) #define EL_MM_BEAMER_BLUE_END EL_MM_BEAMER_BLUE_16 -#define EL_MM_MCDUFFIN 1200 -#define EL_MM_PACMAN 1201 -#define EL_MM_FUSE 1202 -#define EL_MM_STEEL_WALL 1203 -#define EL_MM_WOODEN_WALL 1204 -#define EL_MM_ICE_WALL 1205 -#define EL_MM_AMOEBA_WALL 1206 -#define EL_DF_LASER 1207 -#define EL_DF_RECEIVER 1208 -#define EL_DF_STEEL_WALL 1209 -#define EL_DF_WOODEN_WALL 1210 +#define EL_MM_MCDUFFIN 1204 +#define EL_MM_PACMAN 1205 +#define EL_MM_FUSE 1206 +#define EL_MM_STEEL_WALL 1207 +#define EL_MM_WOODEN_WALL 1208 +#define EL_MM_ICE_WALL 1209 +#define EL_MM_AMOEBA_WALL 1210 +#define EL_DF_LASER 1211 +#define EL_DF_RECEIVER 1212 +#define EL_DF_STEEL_WALL 1213 +#define EL_DF_WOODEN_WALL 1214 #define EL_MM_END_2 (EL_DF_START2 + 430) #define EL_MM_END EL_MM_END_2 -#define NUM_FILE_ELEMENTS 1211 +#define NUM_FILE_ELEMENTS 1215 /* "real" (and therefore drawable) runtime elements */ @@ -2132,73 +2167,74 @@ #define ACTION_EATING 49 #define ACTION_TWINKLING 50 #define ACTION_SPLASHING 51 -#define ACTION_PAGE_1 52 -#define ACTION_PAGE_2 53 -#define ACTION_PAGE_3 54 -#define ACTION_PAGE_4 55 -#define ACTION_PAGE_5 56 -#define ACTION_PAGE_6 57 -#define ACTION_PAGE_7 58 -#define ACTION_PAGE_8 59 -#define ACTION_PAGE_9 60 -#define ACTION_PAGE_10 61 -#define ACTION_PAGE_11 62 -#define ACTION_PAGE_12 63 -#define ACTION_PAGE_13 64 -#define ACTION_PAGE_14 65 -#define ACTION_PAGE_15 66 -#define ACTION_PAGE_16 67 -#define ACTION_PAGE_17 68 -#define ACTION_PAGE_18 69 -#define ACTION_PAGE_19 70 -#define ACTION_PAGE_20 71 -#define ACTION_PAGE_21 72 -#define ACTION_PAGE_22 73 -#define ACTION_PAGE_23 74 -#define ACTION_PAGE_24 75 -#define ACTION_PAGE_25 76 -#define ACTION_PAGE_26 77 -#define ACTION_PAGE_27 78 -#define ACTION_PAGE_28 79 -#define ACTION_PAGE_29 80 -#define ACTION_PAGE_30 81 -#define ACTION_PAGE_31 82 -#define ACTION_PAGE_32 83 -#define ACTION_PART_1 84 -#define ACTION_PART_2 85 -#define ACTION_PART_3 86 -#define ACTION_PART_4 87 -#define ACTION_PART_5 88 -#define ACTION_PART_6 89 -#define ACTION_PART_7 90 -#define ACTION_PART_8 91 -#define ACTION_PART_9 92 -#define ACTION_PART_10 93 -#define ACTION_PART_11 94 -#define ACTION_PART_12 95 -#define ACTION_PART_13 96 -#define ACTION_PART_14 97 -#define ACTION_PART_15 98 -#define ACTION_PART_16 99 -#define ACTION_PART_17 100 -#define ACTION_PART_18 101 -#define ACTION_PART_19 102 -#define ACTION_PART_20 103 -#define ACTION_PART_21 104 -#define ACTION_PART_22 105 -#define ACTION_PART_23 106 -#define ACTION_PART_24 107 -#define ACTION_PART_25 108 -#define ACTION_PART_26 109 -#define ACTION_PART_27 110 -#define ACTION_PART_28 111 -#define ACTION_PART_29 112 -#define ACTION_PART_30 113 -#define ACTION_PART_31 114 -#define ACTION_PART_32 115 -#define ACTION_OTHER 116 - -#define NUM_ACTIONS 117 +#define ACTION_HITTING 52 +#define ACTION_PAGE_1 53 +#define ACTION_PAGE_2 54 +#define ACTION_PAGE_3 55 +#define ACTION_PAGE_4 56 +#define ACTION_PAGE_5 57 +#define ACTION_PAGE_6 58 +#define ACTION_PAGE_7 59 +#define ACTION_PAGE_8 60 +#define ACTION_PAGE_9 61 +#define ACTION_PAGE_10 62 +#define ACTION_PAGE_11 63 +#define ACTION_PAGE_12 64 +#define ACTION_PAGE_13 65 +#define ACTION_PAGE_14 66 +#define ACTION_PAGE_15 67 +#define ACTION_PAGE_16 68 +#define ACTION_PAGE_17 69 +#define ACTION_PAGE_18 70 +#define ACTION_PAGE_19 71 +#define ACTION_PAGE_20 72 +#define ACTION_PAGE_21 73 +#define ACTION_PAGE_22 74 +#define ACTION_PAGE_23 75 +#define ACTION_PAGE_24 76 +#define ACTION_PAGE_25 77 +#define ACTION_PAGE_26 78 +#define ACTION_PAGE_27 79 +#define ACTION_PAGE_28 80 +#define ACTION_PAGE_29 81 +#define ACTION_PAGE_30 82 +#define ACTION_PAGE_31 83 +#define ACTION_PAGE_32 84 +#define ACTION_PART_1 85 +#define ACTION_PART_2 86 +#define ACTION_PART_3 87 +#define ACTION_PART_4 88 +#define ACTION_PART_5 89 +#define ACTION_PART_6 90 +#define ACTION_PART_7 91 +#define ACTION_PART_8 92 +#define ACTION_PART_9 93 +#define ACTION_PART_10 94 +#define ACTION_PART_11 95 +#define ACTION_PART_12 96 +#define ACTION_PART_13 97 +#define ACTION_PART_14 98 +#define ACTION_PART_15 99 +#define ACTION_PART_16 100 +#define ACTION_PART_17 101 +#define ACTION_PART_18 102 +#define ACTION_PART_19 103 +#define ACTION_PART_20 104 +#define ACTION_PART_21 105 +#define ACTION_PART_22 106 +#define ACTION_PART_23 107 +#define ACTION_PART_24 108 +#define ACTION_PART_25 109 +#define ACTION_PART_26 110 +#define ACTION_PART_27 111 +#define ACTION_PART_28 112 +#define ACTION_PART_29 113 +#define ACTION_PART_30 114 +#define ACTION_PART_31 115 +#define ACTION_PART_32 116 +#define ACTION_OTHER 117 + +#define NUM_ACTIONS 118 #define ACTION_BORING_LAST ACTION_BORING_10 #define ACTION_SLEEPING_LAST ACTION_SLEEPING_3 @@ -2670,6 +2706,23 @@ struct InitInfo struct MenuPosInfo busy; }; +struct TextTypeInfo +{ + int large_spacing; + int normal_spacing; + + int extra_spacing; +}; + +struct MenuTextInfo +{ + struct TextTypeInfo paragraph; + struct TextTypeInfo headline; + struct TextTypeInfo line; + + struct TextTypeInfo all; +}; + struct MenuInfo { int draw_xoffset[NUM_SPECIAL_GFX_ARGS]; @@ -2684,6 +2737,8 @@ struct MenuInfo int list_size[NUM_SPECIAL_GFX_ARGS]; int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; + struct MenuTextInfo text; + struct TitleFadingInfo enter_menu; struct TitleFadingInfo leave_menu; struct TitleFadingInfo enter_screen[NUM_SPECIAL_GFX_ARGS]; @@ -2934,6 +2989,7 @@ struct LevelInfo int time; /* available time (seconds) */ int gems_needed; + boolean auto_count_gems; char name[MAX_LEVEL_NAME_LEN + 1]; char author[MAX_LEVEL_AUTHOR_LEN + 1]; @@ -3020,6 +3076,14 @@ struct LevelInfo boolean block_last_field; /* player blocks previous field while moving */ boolean sp_block_last_field; /* player blocks previous field while moving */ + /* values for MM/DF elements */ + 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 */ @@ -3027,6 +3091,8 @@ struct LevelInfo boolean use_custom_template; /* use custom properties from template file */ + boolean file_has_custom_elements; /* set when level file contains CEs */ + boolean no_valid_file; /* set when level file missing or invalid */ boolean no_level_file; /* set when falling back to level template */