X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=8c3258cae2edbb67936ac050ce8d04a9e0930e7a;hb=1a22e8bdd70708d1ee0bb3f21a456eca4e3de50a;hp=56998a0530cb33d922709f7dcb17e08caa6858ac;hpb=617fc4a5748a1f2f48614b5dd30915852bf39fc2;p=rocksndiamonds.git diff --git a/src/main.h b/src/main.h index 56998a05..8c3258ca 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 @@ -954,7 +962,8 @@ #define MIN_ELEMENTS_IN_GROUP 1 #define MAX_ELEMENTS_IN_GROUP 16 #define MIN_ANDROID_ELEMENTS 1 -#define MAX_ANDROID_ELEMENTS 16 +#define MAX_ANDROID_ELEMENTS 32 +#define MAX_ANDROID_ELEMENTS_OLD 16 // (extended after version 4.1.4.1) // values for elements with content #define MIN_ELEMENT_CONTENTS 1 @@ -2312,6 +2321,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, @@ -2547,8 +2557,8 @@ enum // program information and versioning definitions #define PROGRAM_VERSION_SUPER 4 -#define PROGRAM_VERSION_MAJOR 1 -#define PROGRAM_VERSION_MINOR 4 +#define PROGRAM_VERSION_MAJOR 2 +#define PROGRAM_VERSION_MINOR 0 #define PROGRAM_VERSION_PATCH 0 #define PROGRAM_VERSION_EXTRA "" @@ -2556,7 +2566,7 @@ enum #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" @@ -2680,6 +2690,8 @@ struct MenuMainButtonInfo struct MenuPosInfo insert_solution; struct MenuPosInfo play_solution; + + struct MenuPosInfo switch_ecs_aga; }; struct MenuMainTextInfo @@ -3115,7 +3127,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;