X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=6917ee0b1aabc04799fb382eff7feb95d0b7cdeb;hb=830ab4d58b00129ff57c9600dc99a2494af8841c;hp=480784b1041ad2680a4294af5eecf27c42cc90f2;hpb=57f6ae0759f8f895ad1fc88a4eb2279404a8bb2c;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 480784b1..6917ee0b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -2234,7 +2234,7 @@ void InitElementPropertiesStatic()
     -1
   };
 
-  static int ep_can_explode_dyna[] =
+  static int ep_can_explode_cross[] =
   {
     -1
   };
@@ -2830,6 +2830,12 @@ void InitElementPropertiesStatic()
     -1
   };
 
+  static int ep_can_turn_each_move[] =
+  {
+    /* !!! do something !!! */
+    -1
+  };
+
   static int ep_active_bomb[] =
   {
     EL_DYNAMITE_ACTIVE,
@@ -3026,7 +3032,7 @@ void InitElementPropertiesStatic()
     { ep_droppable,		EP_DROPPABLE		},
     { ep_can_explode_1x1,	EP_CAN_EXPLODE_1X1	},
     { ep_pushable,		EP_PUSHABLE		},
-    { ep_can_explode_dyna,	EP_CAN_EXPLODE_DYNA	},
+    { ep_can_explode_cross,	EP_CAN_EXPLODE_CROSS	},
     { ep_protected,		EP_PROTECTED		},
 
     { ep_player,		EP_PLAYER		},
@@ -3050,6 +3056,7 @@ void InitElementPropertiesStatic()
     { ep_amoeboid,		EP_AMOEBOID		},
     { ep_amoebalive,		EP_AMOEBALIVE		},
     { ep_has_content,		EP_HAS_CONTENT		},
+    { ep_can_turn_each_move,	EP_CAN_TURN_EACH_MOVE	},
     { ep_active_bomb,		EP_ACTIVE_BOMB		},
     { ep_inactive,		EP_INACTIVE		},
 
@@ -3320,7 +3327,7 @@ void InitElementPropertiesEngine(int engine_version)
     /* ---------- CAN_EXPLODE_3X3 ------------------------------------------ */
     SET_PROPERTY(i, EP_CAN_EXPLODE_3X3, (CAN_EXPLODE(i) &&
 					 !CAN_EXPLODE_1X1(i) &&
-					 !CAN_EXPLODE_DYNA(i)));
+					 !CAN_EXPLODE_CROSS(i)));
 
     /* ---------- CAN_EXPLODE_BY_DRAGONFIRE -------------------------------- */
     SET_PROPERTY(i, EP_CAN_EXPLODE_BY_DRAGONFIRE, CAN_EXPLODE_BY_FIRE(i));
@@ -3330,7 +3337,8 @@ void InitElementPropertiesEngine(int engine_version)
 						  i == EL_BLACK_ORB));
 
     /* ---------- COULD_MOVE_INTO_ACID ------------------------------------- */
-    SET_PROPERTY(i, EP_COULD_MOVE_INTO_ACID, (CAN_MOVE(i) ||
+    SET_PROPERTY(i, EP_COULD_MOVE_INTO_ACID, (ELEM_IS_PLAYER(i) ||
+					      CAN_MOVE(i) ||
 					      IS_CUSTOM_ELEMENT(i)));
 
     /* ---------- MAYBE_DONT_COLLIDE_WITH ---------------------------------- */
@@ -3356,7 +3364,7 @@ void InitElementPropertiesEngine(int engine_version)
       printf("::: %d, %d, %d -> %d\n",
 	     CAN_EXPLODE_1X1(i),
 	     CAN_EXPLODE_3X3(i),
-	     CAN_EXPLODE_DYNA(i),
+	     CAN_EXPLODE_CROSS(i),
 	     CAN_EXPLODE(i));
 #endif