X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=3b109635003994cd4c5138e51aaa587b361638a9;hb=ec178b8090e5767eeaa8ab33515c3dcfb954028b;hp=68ad89ca303d0a240c3c656f0e3d25204e26c355;hpb=c42450df0ac6ff7b6db97bf0df12b9c73055c727;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index 68ad89ca..3b109635 100644
--- a/src/main.h
+++ b/src/main.h
@@ -175,11 +175,12 @@
 #define CE_OTHER_GETS_DROPPED	15
 
 /* values for activating change events (also stored in level file!) */
-#define CE_BY_PLAYER		16
-#define CE_BY_COLLISION		17
-#define CE_BY_OTHER		18
+#define CE_BY_PLAYER		16 /* obsolete; map'd to CE_BY_DIRECT_ACTION */
+#define CE_BY_COLLISION		17 /* obsolete; map'd to CE_BY_DIRECT_ACTION */
+#define CE_BY_OTHER_ACTION	18
+#define CE_BY_DIRECT_ACTION	19
 
-#define NUM_CHANGE_EVENTS	19
+#define NUM_CHANGE_EVENTS	20
 
 #define CE_BITMASK_DEFAULT	0
 
@@ -1266,9 +1267,8 @@ struct ElementChangeInfo
 
   /* ---------- internal values used in level editor ---------- */
 
-  int player_action;		/* touched/pressed/pushed by player */
-  int collide_action;		/* collision/impact/smashed */
-  int other_action;		/* various change actions */
+  int direct_action;		/* change triggered by actions on element */
+  int other_action;		/* change triggered by other element actions */
 };
 
 struct ElementInfo