X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=41af237ffb501ad04bde6d07b49cfa6ea4ee2a30;hb=90cd4dc88df3f891ecaa0ee9b9010fe432154503;hp=93874a7e974a57883f29df82c51f02e9abb3adbe;hpb=f93552d6cd84e880ee73d4864018167aefc1bb79;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 93874a7e..41af237f 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)
@@ -954,7 +961,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
@@ -2370,10 +2378,13 @@ enum
   GFX_ARG_DRAW_ORDER,
   GFX_ARG_INIT_DELAY_FIXED,
   GFX_ARG_INIT_DELAY_RANDOM,
+  GFX_ARG_INIT_DELAY_ACTION,
   GFX_ARG_ANIM_DELAY_FIXED,
   GFX_ARG_ANIM_DELAY_RANDOM,
+  GFX_ARG_ANIM_DELAY_ACTION,
   GFX_ARG_POST_DELAY_FIXED,
   GFX_ARG_POST_DELAY_RANDOM,
+  GFX_ARG_POST_DELAY_ACTION,
   GFX_ARG_INIT_EVENT,
   GFX_ARG_INIT_EVENT_ACTION,
   GFX_ARG_ANIM_EVENT,
@@ -2386,6 +2397,7 @@ enum
   GFX_ARG_FADE_DELAY,
   GFX_ARG_POST_DELAY,
   GFX_ARG_AUTO_DELAY,
+  GFX_ARG_AUTO_DELAY_UNIT,
   GFX_ARG_ALIGN,
   GFX_ARG_VALIGN,
   GFX_ARG_SORT_PRIORITY,
@@ -2544,8 +2556,8 @@ enum
 // program information and versioning definitions
 #define PROGRAM_VERSION_SUPER		4
 #define PROGRAM_VERSION_MAJOR		1
-#define PROGRAM_VERSION_MINOR		2
-#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"
@@ -2645,10 +2657,15 @@ struct RequestButtonInfo
   struct TextPosInfo yes;
   struct TextPosInfo no;
   struct TextPosInfo confirm;
+
   struct TextPosInfo player_1;
   struct TextPosInfo player_2;
   struct TextPosInfo player_3;
   struct TextPosInfo player_4;
+
+  struct TextPosInfo touch_yes;
+  struct TextPosInfo touch_no;
+  struct TextPosInfo touch_confirm;
 };
 
 struct MenuMainButtonInfo
@@ -2671,6 +2688,8 @@ struct MenuMainButtonInfo
 
   struct MenuPosInfo insert_solution;
   struct MenuPosInfo play_solution;
+
+  struct MenuPosInfo switch_ecs_aga;
 };
 
 struct MenuMainTextInfo
@@ -2715,12 +2734,29 @@ struct MenuMainInfo
   struct TextPosInfo network_players;
 };
 
+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
+{
+  struct MenuSetupButtonInfo button;
+};
+
 struct TitleFadingInfo
 {
   int fade_mode;
   int fade_delay;
   int post_delay;
   int auto_delay;
+  int auto_delay_unit;
 };
 
 struct TitleMessageInfo
@@ -2739,6 +2775,7 @@ struct TitleMessageInfo
   int fade_delay;
   int post_delay;
   int auto_delay;
+  int auto_delay_unit;
 };
 
 struct InitInfo
@@ -2801,6 +2838,7 @@ struct MenuInfo
   int music[NUM_SPECIAL_GFX_ARGS];
 
   struct MenuMainInfo main;
+  struct MenuSetupInfo setup;
 };
 
 struct DoorInfo
@@ -3087,7 +3125,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;
@@ -3156,6 +3194,9 @@ struct LevelInfo
 
   // runtime flags to handle bugs in old levels (not stored in level file)
   boolean use_action_after_change_bug;
+
+  // runtime flags to indicate level properties (not stored in level file)
+  boolean has_mouse_events;
 };
 
 struct NetworkLevelInfo
@@ -3461,10 +3502,13 @@ struct GraphicInfo
 
   int init_delay_fixed;		// optional initial delay values for global
   int init_delay_random;	// animations (pause interval before start)
+  int init_delay_action;	// optional action called on animation start
   int anim_delay_fixed;		// optional delay values for bored/sleeping
   int anim_delay_random;	// and global animations (animation length)
+  int anim_delay_action;	// optional action called on animation end
   int post_delay_fixed;		// optional delay values after bored/global
   int post_delay_random;	// animations (pause before next animation)
+  int post_delay_action;	// optional action called after post delay
 
   int init_event;		// optional event triggering animation start
   int init_event_action;	// optional action called on animation start
@@ -3490,6 +3534,7 @@ struct GraphicInfo
   int fade_delay;		// optional setting for drawing title screens
   int post_delay;		// optional setting for drawing title screens
   int auto_delay;		// optional setting for drawing title screens
+  int auto_delay_unit;		// optional setting for drawing title screens
   int align, valign;		// optional setting for drawing title screens
   int sort_priority;		// optional setting for drawing title screens