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

diff --git a/src/main.h b/src/main.h
index 8a0fca2c..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
 
@@ -895,11 +896,12 @@
 #define GFX_SPECIAL_ARG_EDITOR			3
 #define GFX_SPECIAL_ARG_INFO			4
 #define GFX_SPECIAL_ARG_SETUP			5
-#define GFX_SPECIAL_ARG_DOOR			6
-#define GFX_SPECIAL_ARG_PREVIEW			7
-#define GFX_SPECIAL_ARG_CRUMBLED		8
+#define GFX_SPECIAL_ARG_PLAYING			6
+#define GFX_SPECIAL_ARG_DOOR			7
+#define GFX_SPECIAL_ARG_PREVIEW			8
+#define GFX_SPECIAL_ARG_CRUMBLED		9
 
-#define NUM_SPECIAL_GFX_ARGS			9
+#define NUM_SPECIAL_GFX_ARGS			10
 
 
 /* values for image configuration suffixes */
@@ -979,12 +981,12 @@
 #define GAME_MODE_EDITOR			3
 #define GAME_MODE_INFO				4
 #define GAME_MODE_SETUP				5
-#define GAME_MODE_PSEUDO_DOOR			6
-#define GAME_MODE_PSEUDO_PREVIEW		7
-#define GAME_MODE_PSEUDO_CRUMBLED		8
+#define GAME_MODE_PLAYING			6
+#define GAME_MODE_PSEUDO_DOOR			7
+#define GAME_MODE_PSEUDO_PREVIEW		8
+#define GAME_MODE_PSEUDO_CRUMBLED		9
 
 /* there are no special config file suffixes for these modes */
-#define GAME_MODE_PLAYING			9
 #define GAME_MODE_PSEUDO_TYPENAME		10
 #define GAME_MODE_QUIT				11
 
@@ -1265,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