X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.h;h=c5939594ac7e67d827ad9d7fecb9b73cbef00ec7;hp=f990acf942f8ca65d9bc39345c233f62671ad4c5;hb=8f9768f67f24a3279d812ee1760e8dc8e723145d;hpb=e9618e7bfc295508745c1d418ac4fff86b50bf36

diff --git a/src/main.h b/src/main.h
index f990acf9..c5939594 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,7 +86,7 @@
 #define EP_DROPPABLE		22
 #define EP_CAN_EXPLODE_1X1	23
 #define EP_PUSHABLE		24
-#define EP_CAN_EXPLODE_DYNA	25
+#define EP_CAN_EXPLODE_CROSS	25
 #define EP_PROTECTED		26
 #define EP_CAN_MOVE_INTO_ACID	27
 
@@ -324,7 +324,7 @@
 #define IS_DROPPABLE(e)		HAS_PROPERTY(e, EP_DROPPABLE)
 #define CAN_EXPLODE_1X1(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_1X1)
 #define IS_PUSHABLE(e)		HAS_PROPERTY(e, EP_PUSHABLE)
-#define CAN_EXPLODE_DYNA(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_DYNA)
+#define CAN_EXPLODE_CROSS(e)	HAS_PROPERTY(e, EP_CAN_EXPLODE_CROSS)
 #define IS_PROTECTED(e)		HAS_PROPERTY(e, EP_PROTECTED)
 #define CAN_MOVE_INTO_ACID(e)	HAS_PROPERTY(e, EP_CAN_MOVE_INTO_ACID)
 
@@ -1564,14 +1564,14 @@ struct ElementChangeInfo
 
   boolean explode;		/* explode instead of change */
 
+  /* ---------- internal values used at runtime when playing ---------- */
+
   /* functions that are called before, while and after the change of an
      element -- currently only used for non-custom elements */
   void (*pre_change_function)(int x, int y);
   void (*change_function)(int x, int y);
   void (*post_change_function)(int x, int y);
 
-  /* ---------- internal values used at runtime when playing ---------- */
-
   short actual_trigger_element;	/* element that actually triggered change */
   int actual_trigger_player;	/* player which actually triggered change */