X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=9a769335fd40cabd8dd10eedf4da418464aa1e5e;hb=e357e3c70da663bb319196a3b24328ea5801f643;hp=b55395f409dd85d0b97a5e468d7157d69aaf7d24;hpb=a765a89dce5dd3d870906dbe4580b62313117417;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index b55395f4..9a769335 100644
--- a/src/files.c
+++ b/src/files.c
@@ -7975,11 +7975,11 @@ void SaveScore(int nr)
 #define NUM_GLOBAL_SETUP_TOKENS			43
 
 /* editor setup */
-#define SETUP_TOKEN_EDITOR_EL_CHARS		0
-#define SETUP_TOKEN_EDITOR_EL_STEEL_CHARS	1
-#define SETUP_TOKEN_EDITOR_EL_CUSTOM		2
-#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED	3
-#define SETUP_TOKEN_EDITOR_EL_DYNAMIC		4
+#define SETUP_TOKEN_EDITOR_EL_CLASSIC		0
+#define SETUP_TOKEN_EDITOR_EL_CUSTOM		1
+#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED	2
+#define SETUP_TOKEN_EDITOR_EL_DYNAMIC		3
+#define SETUP_TOKEN_EDITOR_EL_HEADLINES		4
 #define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN	5
 
 #define NUM_EDITOR_SETUP_TOKENS			6
@@ -8167,11 +8167,11 @@ static struct TokenInfo global_setup_tokens[] =
 
 static struct TokenInfo editor_setup_tokens[] =
 {
-  { TYPE_SWITCH, &sei.el_chars,		"editor.el_chars"		},
-  { TYPE_SWITCH, &sei.el_steel_chars,	"editor.el_steel_chars"		},
+  { TYPE_SWITCH, &sei.el_classic,	"editor.el_classic"		},
   { TYPE_SWITCH, &sei.el_custom,	"editor.el_custom"		},
   { TYPE_SWITCH, &sei.el_user_defined,	"editor.el_user_defined"	},
   { TYPE_SWITCH, &sei.el_dynamic,	"editor.el_dynamic"		},
+  { TYPE_SWITCH, &sei.el_headlines,	"editor.el_headlines"		},
   { TYPE_SWITCH, &sei.show_element_token,"editor.show_element_token"	},
 };
 
@@ -8376,13 +8376,16 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->editor.el_dx_boulderdash		= TRUE;
   si->editor.el_chars			= TRUE;
   si->editor.el_steel_chars		= TRUE;
+
+  si->editor.el_classic			= TRUE;
   si->editor.el_custom			= TRUE;
 
-  si->editor.el_headlines = TRUE;
-  si->editor.el_user_defined = FALSE;
-  si->editor.el_dynamic = TRUE;
+  si->editor.el_user_defined		= FALSE;
+  si->editor.el_dynamic			= TRUE;
+
+  si->editor.el_headlines		= TRUE;
 
-  si->editor.show_element_token = FALSE;
+  si->editor.show_element_token		= FALSE;
 
   si->shortcut.save_game	= DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game	= DEFAULT_KEY_LOAD_GAME;