X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=92a7019409982120ff7abc2eaf2503ee91ac1121;hb=8f9768f67f24a3279d812ee1760e8dc8e723145d;hp=c4528006afb2aaf0d448f94d61713fa981968f9a;hpb=5216f629803d5255919cadc2419fb1e798812ae2;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index c4528006..92a70194 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
   };
@@ -3026,7 +3026,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		},
@@ -3320,7 +3320,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 +3330,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 +3357,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
 
@@ -3447,7 +3448,7 @@ void InitElementPropertiesEngine(int engine_version)
 
       element_info[element].access_direction = MV_ALL_DIRECTIONS;
 
-      element_info[element].explosion_delay = 18;
+      element_info[element].explosion_delay = 17;
       element_info[element].ignition_delay = 8;
     }
   }