X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=4325c379020fd853495d92b439597f7b79affa4e;hp=48752bd0ea54c1d6ee40e74b44741a10a7a82458;hb=HEAD;hpb=91e97fb5df27413678f5f884f6074e5802e6b2ca diff --git a/src/main.h b/src/main.h index 48752bd0..6f5b29c7 100644 --- a/src/main.h +++ b/src/main.h @@ -1980,10 +1980,17 @@ #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_MM_END_3 EL_DF_MIRROR_FIXED_END -#define EL_DF_END_2 EL_DF_MIRROR_FIXED_END +#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 NUM_FILE_ELEMENTS 1249 +#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 @@ -2490,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, @@ -2545,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, @@ -2654,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 5 +#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" @@ -3470,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 @@ -3584,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]; @@ -3732,6 +3745,7 @@ struct GraphicInfo int class; int style; + int alpha; int active_xoffset; int active_yoffset; @@ -3772,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;