X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=58483c61f5496183c7842682e7ee5ede414fbd28;hb=1e5cae5e3ab889c3bcba80a065c6d7ba1e6d28a2;hp=833f32ddd1a14a1f728980ce493c2866cfabf138;hpb=a69eb334eb2efcbd1d0dcf26ccfd2e350b419697;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 833f32dd..58483c61 100644
--- a/src/main.h
+++ b/src/main.h
@@ -115,7 +115,7 @@
 #define EP_KEYGATE			49
 #define EP_AMOEBOID			50
 #define EP_AMOEBALIVE			51
-#define EP_HAS_CONTENT			52
+#define EP_HAS_EDITOR_CONTENT		52
 #define EP_CAN_TURN_EACH_MOVE		53
 #define EP_CAN_GROW			54
 #define EP_ACTIVE_BOMB			55
@@ -521,7 +521,7 @@
 #define IS_KEYGATE(e)		HAS_PROPERTY(e, EP_KEYGATE)
 #define IS_AMOEBOID(e)		HAS_PROPERTY(e, EP_AMOEBOID)
 #define IS_AMOEBALIVE(e)	HAS_PROPERTY(e, EP_AMOEBALIVE)
-#define HAS_CONTENT(e)		HAS_PROPERTY(e, EP_HAS_CONTENT)
+#define HAS_EDITOR_CONTENT(e)	HAS_PROPERTY(e, EP_HAS_EDITOR_CONTENT)
 #define CAN_TURN_EACH_MOVE(e)	HAS_PROPERTY(e, EP_CAN_TURN_EACH_MOVE)
 #define CAN_GROW(e)		HAS_PROPERTY(e, EP_CAN_GROW)
 #define IS_ACTIVE_BOMB(e)	HAS_PROPERTY(e, EP_ACTIVE_BOMB)
@@ -746,6 +746,8 @@
 #define MAX_CHANGE_PAGES	32
 #define MIN_ELEMENTS_IN_GROUP	1
 #define MAX_ELEMENTS_IN_GROUP	16
+#define MIN_ANDROID_ELEMENTS	1
+#define MAX_ANDROID_ELEMENTS	16
 
 /* values for elements with content */
 #define MIN_ELEMENT_CONTENTS	1
@@ -1910,8 +1912,12 @@ struct LevelInfo
   struct Content ball_content[MAX_ELEMENT_CONTENTS];
   int num_ball_contents;
 
+#if 0
   boolean android_array[16];
 #endif
+  int num_android_clone_elements;
+  int android_clone_element[MAX_ANDROID_ELEMENTS];
+#endif
 
   int can_move_into_acid_bits;	/* bitfield to store property for elements */
   int dont_collide_with_bits;	/* bitfield to store property for elements */
@@ -2015,6 +2021,8 @@ struct GameInfo
   /* values for the new EMC elements */
   int lenses_time_left;
   int magnify_time_left;
+  boolean ball_state;
+  int ball_content_nr;
 #endif
 
   /* values for player idle animation (no effect on engine) */