X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=6f5b29c7f1da626de92db63f26b39d1a00461e41;hp=22e63d7f2695290000fb88c15598ea9525521e40;hb=HEAD;hpb=fdd2caa8bb685c6d1590ba7e1f07445a1714724d diff --git a/src/main.h b/src/main.h index 22e63d7f..6f5b29c7 100644 --- a/src/main.h +++ b/src/main.h @@ -201,9 +201,9 @@ #define EP_BITMASK_DEFAULT 0 #define PROPERTY_BIT(p) (1u << ((p) % 32)) -#define PROPERTY_VAR(e,p) (element_info[e].properties[(p) / 32]) -#define HAS_PROPERTY(e,p) ((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0) -#define SET_PROPERTY(e,p,v) ((v) ? \ +#define PROPERTY_VAR(e, p) (element_info[e].properties[(p) / 32]) +#define HAS_PROPERTY(e, p) ((PROPERTY_VAR(e, p) & PROPERTY_BIT(p)) != 0) +#define SET_PROPERTY(e, p, v) ((v) ? \ (PROPERTY_VAR(e,p) |= PROPERTY_BIT(p)) : \ (PROPERTY_VAR(e,p) &= ~PROPERTY_BIT(p))) @@ -273,19 +273,19 @@ #define CH_EVENT_BITFIELD_NR(e) (e / 32) #define CH_EVENT_BIT(e) (1 << ((e) % 32)) -#define CH_EVENT_VAR(e,c) (element_info[e].change->has_event[c]) -#define CH_ANY_EVENT_VAR(e,c) (element_info[e].has_change_event[c]) +#define CH_EVENT_VAR(e, c) (element_info[e].change->has_event[c]) +#define CH_ANY_EVENT_VAR(e, c) (element_info[e].has_change_event[c]) -#define PAGE_HAS_CHANGE_EVENT(p,c) ((p)->has_event[c]) -#define HAS_CHANGE_EVENT(e,c) (IS_CUSTOM_ELEMENT(e) && \ - CH_EVENT_VAR(e,c)) -#define HAS_ANY_CHANGE_EVENT(e,c) (IS_CUSTOM_ELEMENT(e) && \ - CH_ANY_EVENT_VAR(e,c)) +#define PAGE_HAS_CHANGE_EVENT(p, c) ((p)->has_event[c]) +#define HAS_CHANGE_EVENT(e, c) (IS_CUSTOM_ELEMENT(e) && \ + CH_EVENT_VAR(e, c)) +#define HAS_ANY_CHANGE_EVENT(e, c) (IS_CUSTOM_ELEMENT(e) && \ + CH_ANY_EVENT_VAR(e, c)) -#define SET_CHANGE_EVENT(e,c,v) (IS_CUSTOM_ELEMENT(e) ? \ - CH_EVENT_VAR(e,c) = (v) : 0) -#define SET_ANY_CHANGE_EVENT(e,c,v) (IS_CUSTOM_ELEMENT(e) ? \ - CH_ANY_EVENT_VAR(e,c) = (v) : 0) +#define SET_CHANGE_EVENT(e, c, v) (IS_CUSTOM_ELEMENT(e) ? \ + CH_EVENT_VAR(e, c) = (v) : 0) +#define SET_ANY_CHANGE_EVENT(e, c, v) (IS_CUSTOM_ELEMENT(e) ? \ + CH_ANY_EVENT_VAR(e, c) = (v) : 0) // values for player bitmasks #define PLAYER_BITS_NONE 0 @@ -697,11 +697,22 @@ #define IS_INTERNAL_ELEMENT(e) ((e) >= EL_INTERNAL_START && \ (e) <= EL_INTERNAL_END) -#define IS_MM_ELEMENT(e) ((e) >= EL_MM_START && \ - (e) <= EL_MM_END) - -#define IS_DF_ELEMENT(e) ((e) >= EL_DF_START && \ - (e) <= EL_DF_END) +#define IS_MM_ELEMENT_1(e) ((e) >= EL_MM_START_1 && \ + (e) <= EL_MM_END_1) +#define IS_MM_ELEMENT_2(e) ((e) >= EL_MM_START_2 && \ + (e) <= EL_MM_END_2) +#define IS_MM_ELEMENT_3(e) ((e) >= EL_MM_START_3 && \ + (e) <= EL_MM_END_3) +#define IS_MM_ELEMENT(e) (IS_MM_ELEMENT_1(e) || \ + IS_MM_ELEMENT_2(e) || \ + IS_MM_ELEMENT_3(e)) + +#define IS_DF_ELEMENT_1(e) ((e) >= EL_DF_START_1 && \ + (e) <= EL_DF_END_1) +#define IS_DF_ELEMENT_2(e) ((e) >= EL_DF_START_2 && \ + (e) <= EL_DF_END_2) +#define IS_DF_ELEMENT(e) (IS_DF_ELEMENT_1(e) || \ + IS_DF_ELEMENT_2(e)) #define IS_MM_MCDUFFIN(e) ((e) >= EL_MM_MCDUFFIN_START && \ (e) <= EL_MM_MCDUFFIN_END) @@ -871,9 +882,9 @@ #define IS_FREE(x, y) (Tile[x][y] == EL_EMPTY && !IS_PLAYER(x, y)) #define IS_FREE_OR_PLAYER(x, y) (Tile[x][y] == EL_EMPTY) -#define IS_MOVING(x,y) (MovPos[x][y] != 0) -#define IS_FALLING(x,y) (MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN) -#define IS_BLOCKED(x,y) (Tile[x][y] == EL_BLOCKED) +#define IS_MOVING(x, y) (MovPos[x][y] != 0) +#define IS_FALLING(x, y) (MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN) +#define IS_BLOCKED(x, y) (Tile[x][y] == EL_BLOCKED) #define IS_MV_DIAGONAL(x) ((x) & MV_HORIZONTAL && (x) & MV_VERTICAL) @@ -901,13 +912,13 @@ #define TAPE_IS_EMPTY(x) ((x).length == 0) #define TAPE_IS_STOPPED(x) (!(x).recording && !(x).playing) -#define PLAYERINFO(x,y) (&stored_player[StorePlayer[x][y]-EL_PLAYER_1]) +#define PLAYERINFO(x, y) (&stored_player[StorePlayer[x][y] - EL_PLAYER_1]) #define SHIELD_ON(p) ((p)->shield_normal_time_left > 0) -#define ENEMY_PROTECTED_FIELD(x,y) (IS_PROTECTED(Tile[x][y]) || \ +#define ENEMY_PROTECTED_FIELD(x, y) (IS_PROTECTED(Tile[x][y]) || \ IS_PROTECTED(Back[x][y])) -#define EXPLOSION_PROTECTED_FIELD(x,y) (IS_EXPLOSION_PROOF(Tile[x][y])) -#define PLAYER_ENEMY_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \ +#define EXPLOSION_PROTECTED_FIELD(x, y) (IS_EXPLOSION_PROOF(Tile[x][y])) +#define PLAYER_ENEMY_PROTECTED(x, y) (SHIELD_ON(PLAYERINFO(x, y)) || \ ENEMY_PROTECTED_FIELD(x, y)) #define PLAYER_EXPLOSION_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \ EXPLOSION_PROTECTED_FIELD(x, y)) @@ -918,7 +929,7 @@ #define PLAYER_DROPPING(p,x,y) ((p)->is_dropping && \ (p)->drop_x == (x) && (p)->drop_y == (y)) -#define PLAYER_NR_GFX(g,i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1)) +#define PLAYER_NR_GFX(g, i) ((g) + i * (IMG_PLAYER_2 - IMG_PLAYER_1)) #define GET_PLAYER_ELEMENT(e) ((e) >= EL_PLAYER_1 && (e) <= EL_PLAYER_4 ? \ (e) : EL_PLAYER_1) @@ -1719,6 +1730,7 @@ #define EL_MM_START_2 (EL_MM_START + 160) #define EL_DF_START EL_MM_START_2 +#define EL_DF_START_1 EL_MM_START_2 #define EL_DF_START2 (EL_DF_START - 240) #define EL_DF_MIRROR_START EL_DF_START @@ -1844,7 +1856,7 @@ #define EL_DF_STEEL_GRID_ROTATING_8 (EL_DF_STEEL_GRID_ROTATING_START + 7) #define EL_DF_STEEL_GRID_ROTATING_END EL_DF_STEEL_GRID_ROTATING_07 -#define EL_DF_END (EL_DF_START2 + 355) +#define EL_DF_END_1 (EL_DF_START2 + 355) #define EL_MM_TELEPORTER_RED_START (EL_DF_START2 + 356) #define EL_MM_TELEPORTER_RED_1 (EL_MM_TELEPORTER_RED_START + 0) @@ -1932,7 +1944,6 @@ #define EL_DF_WOODEN_WALL 1214 #define EL_MM_END_2 (EL_DF_START2 + 430) -#define EL_MM_END EL_MM_END_2 #define EL_SPRING_LEFT 1215 #define EL_SPRING_RIGHT 1216 @@ -1947,7 +1958,39 @@ #define EL_EMPTY_SPACE_END 1232 // ---------- end of empty space elements section ----------------------------- -#define NUM_FILE_ELEMENTS 1233 +#define EL_MM_START_3 EL_DF_MIRROR_FIXED_START +#define EL_DF_START_2 EL_DF_MIRROR_FIXED_START + +#define EL_DF_MIRROR_FIXED_START 1233 +#define EL_DF_MIRROR_FIXED_1 (EL_DF_MIRROR_FIXED_START + 0) +#define EL_DF_MIRROR_FIXED_2 (EL_DF_MIRROR_FIXED_START + 1) +#define EL_DF_MIRROR_FIXED_3 (EL_DF_MIRROR_FIXED_START + 2) +#define EL_DF_MIRROR_FIXED_4 (EL_DF_MIRROR_FIXED_START + 3) +#define EL_DF_MIRROR_FIXED_5 (EL_DF_MIRROR_FIXED_START + 4) +#define EL_DF_MIRROR_FIXED_6 (EL_DF_MIRROR_FIXED_START + 5) +#define EL_DF_MIRROR_FIXED_7 (EL_DF_MIRROR_FIXED_START + 6) +#define EL_DF_MIRROR_FIXED_8 (EL_DF_MIRROR_FIXED_START + 7) +#define EL_DF_MIRROR_FIXED_9 (EL_DF_MIRROR_FIXED_START + 8) +#define EL_DF_MIRROR_FIXED_10 (EL_DF_MIRROR_FIXED_START + 9) +#define EL_DF_MIRROR_FIXED_11 (EL_DF_MIRROR_FIXED_START + 10) +#define EL_DF_MIRROR_FIXED_12 (EL_DF_MIRROR_FIXED_START + 11) +#define EL_DF_MIRROR_FIXED_13 (EL_DF_MIRROR_FIXED_START + 12) +#define EL_DF_MIRROR_FIXED_14 (EL_DF_MIRROR_FIXED_START + 13) +#define EL_DF_MIRROR_FIXED_15 (EL_DF_MIRROR_FIXED_START + 14) +#define EL_DF_MIRROR_FIXED_16 (EL_DF_MIRROR_FIXED_START + 15) +#define EL_DF_MIRROR_FIXED_END EL_DF_MIRROR_FIXED_16 + +#define EL_DF_SLOPE_START 1249 +#define EL_DF_SLOPE_1 (EL_DF_SLOPE_START + 0) +#define EL_DF_SLOPE_2 (EL_DF_SLOPE_START + 1) +#define EL_DF_SLOPE_3 (EL_DF_SLOPE_START + 2) +#define EL_DF_SLOPE_4 (EL_DF_SLOPE_START + 3) +#define EL_DF_SLOPE_END EL_DF_SLOPE_4 + +#define EL_MM_END_3 EL_DF_SLOPE_END +#define EL_DF_END_2 EL_DF_SLOPE_END + +#define NUM_FILE_ELEMENTS 1253 // "real" (and therefore drawable) runtime elements @@ -2454,6 +2497,7 @@ enum GFX_ARG_SORT_PRIORITY, GFX_ARG_CLASS, GFX_ARG_STYLE, + GFX_ARG_ALPHA, GFX_ARG_ACTIVE_XOFFSET, GFX_ARG_ACTIVE_YOFFSET, GFX_ARG_PRESSED_XOFFSET, @@ -2509,6 +2553,7 @@ enum FONT_ENVELOPE_2, FONT_ENVELOPE_3, FONT_ENVELOPE_4, + FONT_REQUEST_NARROW, FONT_REQUEST, FONT_INPUT_1_ACTIVE, FONT_INPUT_2_ACTIVE, @@ -2618,15 +2663,15 @@ enum // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 #define PROGRAM_VERSION_MAJOR 3 -#define PROGRAM_VERSION_MINOR 5 -#define PROGRAM_VERSION_PATCH 3 +#define PROGRAM_VERSION_MINOR 8 +#define PROGRAM_VERSION_PATCH 2 #define PROGRAM_VERSION_EXTRA "" #define PROGRAM_TITLE_STRING "Rocks'n'Diamonds" #define PROGRAM_AUTHOR_STRING "Holger Schemel" #define PROGRAM_EMAIL_STRING "info@artsoft.org" #define PROGRAM_WEBSITE_STRING "https://www.artsoft.org/" -#define PROGRAM_COPYRIGHT_STRING "1995-2023 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "1995-2024 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_ICON_FILENAME "icons/icon.png" @@ -2883,10 +2928,13 @@ struct MenuInfo int list_size[NUM_SPECIAL_GFX_ARGS]; int list_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int list_entry_size_info[NUM_SPECIAL_GFX_INFO_ARGS]; + int tile_size_info[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 middle_spacing_info[NUM_SPECIAL_GFX_INFO_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]; @@ -3431,6 +3479,8 @@ struct ElementChangeInfo void (*post_change_function)(int x, int y); short actual_trigger_element; // element that actually triggered change + int actual_trigger_x; // element x position that triggered change + int actual_trigger_y; // element y position that triggered change int actual_trigger_side; // element side that triggered the change int actual_trigger_player; // player which actually triggered change int actual_trigger_player_bits; // player bits of triggering players @@ -3545,6 +3595,8 @@ struct ElementInfo struct ElementGroupInfo *group; // pointer to element group info + boolean has_anim_event; // element can trigger global animation + // ---------- internal values used at runtime when playing ---------- boolean has_change_event[NUM_CHANGE_EVENTS]; @@ -3693,6 +3745,7 @@ struct GraphicInfo int class; int style; + int alpha; int active_xoffset; int active_yoffset; @@ -3733,11 +3786,13 @@ struct MusicFileInfo char *artist_header; char *album_header; char *year_header; + char *played_header; char *title; char *artist; char *album; char *year; + char *played; int music;