X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=4fd367c74ab1d7c0c3bb8433b2e12b5bc39a09aa;hb=f681967164edaa7709d1082327fa7c309e05fd87;hp=00740b421d665357c292c083506c199d68ede530;hpb=65bfe5289ae5bcb4c1ea9bee97ebc619e1ecfc16;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 00740b42..4fd367c7 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
@@ -2548,8 +2557,8 @@ enum
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		1
-#define PROGRAM_VERSION_MINOR		3
-#define PROGRAM_VERSION_PATCH		1
+#define PROGRAM_VERSION_MINOR		4
+#define PROGRAM_VERSION_PATCH		2
 #define PROGRAM_VERSION_EXTRA		""
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"
@@ -2680,6 +2689,8 @@ struct MenuMainButtonInfo
 
   struct MenuPosInfo insert_solution;
   struct MenuPosInfo play_solution;
+
+  struct MenuPosInfo switch_ecs_aga;
 };
 
 struct MenuMainTextInfo
@@ -2728,6 +2739,11 @@ struct MenuSetupButtonInfo
 {
   struct MenuPosInfo prev_player;
   struct MenuPosInfo next_player;
+
+  struct MenuPosInfo touch_back;
+  struct MenuPosInfo touch_next;
+  struct MenuPosInfo touch_back2;
+  struct MenuPosInfo touch_next2;
 };
 
 struct MenuSetupInfo
@@ -3110,7 +3126,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;