added being able to use CE condition "CE value/score gets 0"

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 00740b421d665357c292c083506c199d68ede530..bca6d626a04333621f401470048cd1088afe9603 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -954,7 +954,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 +2549,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 +2681,8 @@ struct MenuMainButtonInfo
 
   struct MenuPosInfo insert_solution;
   struct MenuPosInfo play_solution;
+
+  struct MenuPosInfo switch_ecs_aga;
 };
 
 struct MenuMainTextInfo
@@ -2728,6 +2731,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 +3118,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;