X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=e6baec2532cc26d4636cb68c21a7e129e3f62798;hb=6d7ebf6db8a9a57f2e3e398da1d2f7d8d084523f;hp=a0b0aff35554a0bfcf5b1ebb794523fd0c663f74;hpb=95ff39b11bc3c268d8206193bad1433ac9526c94;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index a0b0aff3..e6baec25 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3378,6 +3378,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
       int element = EL_CUSTOM_START + i;
 
       /* order of checking and copying events to be mapped is important */
+      /* (do not change the start and end value -- they are constant) */
       for (j = CE_BY_OTHER_ACTION; j >= CE_VALUE_GETS_ZERO; j--)
       {
 	if (HAS_CHANGE_EVENT(element, j - 2))
@@ -3388,6 +3389,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
       }
 
       /* order of checking and copying events to be mapped is important */
+      /* (do not change the start and end value -- they are constant) */
       for (j = CE_PLAYER_COLLECTS_X; j >= CE_HITTING_SOMETHING; j--)
       {
 	if (HAS_CHANGE_EVENT(element, j - 1))
@@ -4976,8 +4978,9 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_EDITOR_EL_HEADLINES		10
 #define SETUP_TOKEN_EDITOR_EL_USER_DEFINED	11
 #define SETUP_TOKEN_EDITOR_EL_DYNAMIC		12
+#define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN	13
 
-#define NUM_EDITOR_SETUP_TOKENS			13
+#define NUM_EDITOR_SETUP_TOKENS			14
 
 /* editor cascade setup */
 #define SETUP_TOKEN_EDITOR_CASCADE_BD		0
@@ -5095,6 +5098,7 @@ static struct TokenInfo editor_setup_tokens[] =
   { TYPE_SWITCH, &sei.el_headlines,	"editor.el_headlines"		},
   { TYPE_SWITCH, &sei.el_user_defined,	"editor.el_user_defined"	},
   { TYPE_SWITCH, &sei.el_dynamic,	"editor.el_dynamic"		},
+  { TYPE_SWITCH, &sei.show_element_token,"editor.show_element_token"	},
 };
 
 static struct TokenInfo editor_cascade_setup_tokens[] =
@@ -5223,6 +5227,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->editor.el_user_defined = FALSE;
   si->editor.el_dynamic = TRUE;
 
+  si->editor.show_element_token = FALSE;
+
   si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
   si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;