X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=dd7f94d45dc9de35f19e02ef3542b201b5936a19;hb=67758fda340e825f188fc6a4caad03381bf031dc;hp=4b871020796012f2e968bc92d2320d76c497826f;hpb=9cfd3853252303df85d4fb925993448788d03483;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 4b871020..dd7f94d4 100644
--- a/src/init.c
+++ b/src/init.c
@@ -853,11 +853,13 @@ void InitElementProperties()
     EL_AMOEBE_BD,
     EL_MORAST_VOLL,
     EL_MORAST_LEER,
-    EL_SIEB_VOLL,
+    EL_SIEB_INAKTIV,
     EL_SIEB_LEER,
+    EL_SIEB_VOLL,
     EL_SIEB_TOT,
-    EL_SIEB2_VOLL,
+    EL_SIEB2_INAKTIV,
     EL_SIEB2_LEER,
+    EL_SIEB2_VOLL,
     EL_SIEB2_TOT,
     EL_LIFE,
     EL_LIFE_ASYNC,
@@ -940,11 +942,13 @@ void InitElementProperties()
     EL_BADEWANNE2,
     EL_SONDE,
     EL_SP_ZONK,
+    EL_SP_INFOTRON,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
     EL_SP_CHIP_UPPER,
     EL_SP_CHIP_LOWER,
+    EL_SPEED_PILL
   };
   static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
 
@@ -1168,7 +1172,7 @@ void InitElementProperties()
     EL_FELSBODEN,
     EL_FELSBROCKEN,
     EL_EDELSTEIN_BD,
-    EL_SIEB2_LEER,
+    EL_SIEB2_INAKTIV,
     EL_AUSGANG_ZU,
     EL_AUSGANG_AUF,
     EL_BETON,
@@ -1256,7 +1260,9 @@ void InitElementProperties()
     EL_BADEWANNE3,
     EL_BADEWANNE4,
     EL_BADEWANNE5,
+    EL_SIEB_INAKTIV,
     EL_SIEB_TOT,
+    EL_SIEB2_INAKTIV,
     EL_SIEB2_TOT,
     EL_AMOEBA2DIAM,
     EL_BLOCKED,
@@ -1275,7 +1281,6 @@ void InitElementProperties()
     EL_SP_PORT_XY,
     EL_SP_DISK_RED,
     EL_SP_DISK_YELLOW,
-    EL_SP_TERMINAL,
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -1292,7 +1297,6 @@ void InitElementProperties()
     EL_SP_HARD_BASE4,
     EL_SP_HARD_BASE5,
     EL_SP_HARD_BASE6,
-    EL_SP_TERMINAL,
     EL_SP_EXIT
   };
   static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int);
@@ -1366,6 +1370,59 @@ void InitElementProperties()
   };
   static int ep_has_content_num = sizeof(ep_has_content)/sizeof(int);
 
+  static int ep_eatable[] =
+  {
+    EL_ERDREICH,
+    EL_SP_BASE,
+    EL_SP_BUG
+  };
+  static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
+
+  static int ep_sp_element[] =
+  {
+    EL_SP_EMPTY,
+    EL_SP_ZONK,
+    EL_SP_BASE,
+    EL_SP_MURPHY,
+    EL_SP_INFOTRON,
+    EL_SP_CHIP_SINGLE,
+    EL_SP_HARD_GRAY,
+    EL_SP_EXIT,
+    EL_SP_DISK_ORANGE,
+    EL_SP_PORT1_RIGHT,
+    EL_SP_PORT1_DOWN,
+    EL_SP_PORT1_LEFT,
+    EL_SP_PORT1_UP,
+    EL_SP_PORT2_RIGHT,
+    EL_SP_PORT2_DOWN,
+    EL_SP_PORT2_LEFT,
+    EL_SP_PORT2_UP,
+    EL_SP_SNIKSNAK,
+    EL_SP_DISK_YELLOW,
+    EL_SP_TERMINAL,
+    EL_SP_DISK_RED,
+    EL_SP_PORT_Y,
+    EL_SP_PORT_X,
+    EL_SP_PORT_XY,
+    EL_SP_ELECTRON,
+    EL_SP_BUG,
+    EL_SP_CHIP_LEFT,
+    EL_SP_CHIP_RIGHT,
+    EL_SP_HARD_BASE1,
+    EL_SP_HARD_GREEN,
+    EL_SP_HARD_BLUE,
+    EL_SP_HARD_RED,
+    EL_SP_HARD_YELLOW,
+    EL_SP_HARD_BASE2,
+    EL_SP_HARD_BASE3,
+    EL_SP_HARD_BASE4,
+    EL_SP_HARD_BASE5,
+    EL_SP_HARD_BASE6,
+    EL_SP_CHIP_UPPER,
+    EL_SP_CHIP_LOWER
+  };
+  static int ep_sp_element_num = sizeof(ep_sp_element)/sizeof(int);
+
   static long ep_bit[] =
   {
     EP_BIT_AMOEBALIVE,
@@ -1393,7 +1450,9 @@ void InitElementProperties()
     EP_BIT_MAMPF3,
     EP_BIT_PUSHABLE,
     EP_BIT_PLAYER,
-    EP_BIT_HAS_CONTENT
+    EP_BIT_HAS_CONTENT,
+    EP_BIT_EATABLE,
+    EP_BIT_SP_ELEMENT
   };
   static int *ep_array[] =
   {
@@ -1422,7 +1481,9 @@ void InitElementProperties()
     ep_mampf3,
     ep_pushable,
     ep_player,
-    ep_has_content
+    ep_has_content,
+    ep_eatable,
+    ep_sp_element
   };
   static int *ep_num[] =
   {
@@ -1451,7 +1512,9 @@ void InitElementProperties()
     &ep_mampf3_num,
     &ep_pushable_num,
     &ep_player_num,
-    &ep_has_content_num
+    &ep_has_content_num,
+    &ep_eatable_num,
+    &ep_sp_element_num
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);