X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=15b99ab6d298811d249e92eb8cd2c88ae02316e3;hp=49a627e73262e2a4fb6247a1939d9135f10dd0f3;hb=2174ec0a6b545b47aaea3153ef9a67993fc59a93;hpb=93d40da6020c70d47690dabb0498648bfb46da1a diff --git a/src/main.h b/src/main.h index 49a627e7..15b99ab6 100644 --- a/src/main.h +++ b/src/main.h @@ -252,11 +252,18 @@ #define CE_VALUE_CHANGES_OF_X 41 #define CE_SCORE_CHANGES 42 #define CE_SCORE_CHANGES_OF_X 43 +#define CE_CLICKED_BY_MOUSE 44 +#define CE_PRESSED_BY_MOUSE 45 +#define CE_MOUSE_CLICKED_ON_X 46 +#define CE_MOUSE_PRESSED_ON_X 47 -#define NUM_CHANGE_EVENTS 44 +#define NUM_CHANGE_EVENTS 48 #define NUM_CE_BITFIELDS ((NUM_CHANGE_EVENTS + 31) / 32) +#define CE_HEADLINE_SPECIAL_EVENTS 250 +#define CE_UNDEFINED 255 + #define CE_BITMASK_DEFAULT 0 #define CH_EVENT_BITFIELD_NR(e) (e / 32) @@ -366,6 +373,7 @@ #define CA_SET_PLAYER_INVENTORY 18 #define CA_SET_CE_ARTWORK 19 #define CA_SET_LEVEL_RANDOM_SEED 20 +#define CA_MOVE_PLAYER_NEW 21 #define CA_HEADLINE_LEVEL_ACTIONS 250 #define CA_HEADLINE_PLAYER_ACTIONS 251 @@ -1890,7 +1898,10 @@ #define EL_MM_END_2 (EL_DF_START2 + 430) #define EL_MM_END EL_MM_END_2 -#define NUM_FILE_ELEMENTS 1215 +#define EL_SPRING_LEFT 1215 +#define EL_SPRING_RIGHT 1216 + +#define NUM_FILE_ELEMENTS 1217 // "real" (and therefore drawable) runtime elements @@ -2313,6 +2324,7 @@ enum { GFX_SPECIAL_ARG_SETUP_MAIN = 0, GFX_SPECIAL_ARG_SETUP_GAME, + GFX_SPECIAL_ARG_SETUP_ENGINES, GFX_SPECIAL_ARG_SETUP_EDITOR, GFX_SPECIAL_ARG_SETUP_GRAPHICS, GFX_SPECIAL_ARG_SETUP_SOUND, @@ -2548,16 +2560,16 @@ enum // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 -#define PROGRAM_VERSION_MAJOR 1 -#define PROGRAM_VERSION_MINOR 4 -#define PROGRAM_VERSION_PATCH 2 +#define PROGRAM_VERSION_MAJOR 2 +#define PROGRAM_VERSION_MINOR 0 +#define PROGRAM_VERSION_PATCH 1 #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 "http://www.artsoft.org/" -#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2019 by Holger Schemel" +#define PROGRAM_COPYRIGHT_STRING "Copyright \xa9""1995-2020 by Holger Schemel" #define PROGRAM_COMPANY_STRING "A Game by Artsoft Entertainment" #define PROGRAM_ICON_FILENAME "RocksIcon32x32.png" @@ -2681,6 +2693,8 @@ struct MenuMainButtonInfo struct MenuPosInfo insert_solution; struct MenuPosInfo play_solution; + + struct MenuPosInfo switch_ecs_aga; }; struct MenuMainTextInfo @@ -3116,7 +3130,7 @@ struct LevelInfo int android_move_time; int android_clone_time; boolean ball_random; - boolean ball_state_initial; + boolean ball_active_initial; int ball_time; int lenses_score; int magnify_score;