X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=d780a053e1453e4d44e34935756d610fd4d41822;hb=62ce600f34661138022d2ab3e67b254d43b5228e;hp=a08724725fde0ed647c8800701bdc6704a605a35;hpb=9de8eede744c45187c7011543ef8097d1ebc879c;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index a0872472..d780a053 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -366,9 +366,10 @@
 
 #define GADGET_ID_LEVEL_NAME		(GADGET_ID_TEXT_INPUT_FIRST + 0)
 #define GADGET_ID_LEVEL_AUTHOR		(GADGET_ID_TEXT_INPUT_FIRST + 1)
+#define GADGET_ID_ELEMENT_NAME		(GADGET_ID_TEXT_INPUT_FIRST + 2)
 
 /* selectbox identifiers */
-#define GADGET_ID_SELECTBOX_FIRST	(GADGET_ID_TEXT_INPUT_FIRST + 2)
+#define GADGET_ID_SELECTBOX_FIRST	(GADGET_ID_TEXT_INPUT_FIRST + 3)
 
 #define GADGET_ID_CUSTOM_WALK_TO_ACTION	(GADGET_ID_SELECTBOX_FIRST + 0)
 #define GADGET_ID_CUSTOM_CONSISTENCY	(GADGET_ID_SELECTBOX_FIRST + 1)
@@ -377,16 +378,17 @@
 #define GADGET_ID_CUSTOM_MOVE_DIRECTION	(GADGET_ID_SELECTBOX_FIRST + 4)
 #define GADGET_ID_CUSTOM_MOVE_STEPSIZE	(GADGET_ID_SELECTBOX_FIRST + 5)
 #define GADGET_ID_CUSTOM_SMASH_TARGETS	(GADGET_ID_SELECTBOX_FIRST + 6)
-#define GADGET_ID_CUSTOM_ACCESS_TYPE	(GADGET_ID_SELECTBOX_FIRST + 7)
-#define GADGET_ID_CUSTOM_ACCESS_LAYER	(GADGET_ID_SELECTBOX_FIRST + 8)
-#define GADGET_ID_CHANGE_TIME_UNITS	(GADGET_ID_SELECTBOX_FIRST + 9)
-#define GADGET_ID_CHANGE_PLAYER_ACTION	(GADGET_ID_SELECTBOX_FIRST + 10)
-#define GADGET_ID_CHANGE_COLLIDE_ACTION	(GADGET_ID_SELECTBOX_FIRST + 11)
-#define GADGET_ID_CHANGE_OTHER_ACTION	(GADGET_ID_SELECTBOX_FIRST + 12)
-#define GADGET_ID_CHANGE_POWER		(GADGET_ID_SELECTBOX_FIRST + 13)
+#define GADGET_ID_CUSTOM_SLIPPERY_TYPE	(GADGET_ID_SELECTBOX_FIRST + 7)
+#define GADGET_ID_CUSTOM_ACCESS_TYPE	(GADGET_ID_SELECTBOX_FIRST + 8)
+#define GADGET_ID_CUSTOM_ACCESS_LAYER	(GADGET_ID_SELECTBOX_FIRST + 9)
+#define GADGET_ID_CHANGE_TIME_UNITS	(GADGET_ID_SELECTBOX_FIRST + 10)
+#define GADGET_ID_CHANGE_PLAYER_ACTION	(GADGET_ID_SELECTBOX_FIRST + 11)
+#define GADGET_ID_CHANGE_COLLIDE_ACTION	(GADGET_ID_SELECTBOX_FIRST + 12)
+#define GADGET_ID_CHANGE_OTHER_ACTION	(GADGET_ID_SELECTBOX_FIRST + 13)
+#define GADGET_ID_CHANGE_POWER		(GADGET_ID_SELECTBOX_FIRST + 14)
 
 /* textbutton identifiers */
-#define GADGET_ID_TEXTBUTTON_FIRST	(GADGET_ID_SELECTBOX_FIRST + 14)
+#define GADGET_ID_TEXTBUTTON_FIRST	(GADGET_ID_SELECTBOX_FIRST + 15)
 
 #define GADGET_ID_PROPERTIES_INFO	(GADGET_ID_TEXTBUTTON_FIRST + 0)
 #define GADGET_ID_PROPERTIES_CONFIG	(GADGET_ID_TEXTBUTTON_FIRST + 1)
@@ -512,32 +514,34 @@
 /* values for text input gadgets */
 #define ED_TEXTINPUT_ID_LEVEL_NAME	0
 #define ED_TEXTINPUT_ID_LEVEL_AUTHOR	1
+#define ED_TEXTINPUT_ID_ELEMENT_NAME	2
 
-#define ED_NUM_TEXTINPUT		2
+#define ED_NUM_TEXTINPUT		3
 
 #define ED_TEXTINPUT_ID_LEVEL_FIRST	ED_TEXTINPUT_ID_LEVEL_NAME
 #define ED_TEXTINPUT_ID_LEVEL_LAST	ED_TEXTINPUT_ID_LEVEL_AUTHOR
 
 /* values for selectbox gadgets */
-#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION	0
-#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY	1
-#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS	2
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE	0
+#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER	1
+#define ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION	2
 #define ED_SELECTBOX_ID_CUSTOM_MOVE_PATTERN	3
 #define ED_SELECTBOX_ID_CUSTOM_MOVE_DIRECTION	4
 #define ED_SELECTBOX_ID_CUSTOM_MOVE_STEPSIZE	5
 #define ED_SELECTBOX_ID_CUSTOM_SMASH_TARGETS	6
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE	7
-#define ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER	8
-#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS	9
-#define ED_SELECTBOX_ID_CHANGE_PLAYER_ACTION	10
-#define ED_SELECTBOX_ID_CHANGE_COLLIDE_ACTION	11
-#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION	12
-#define ED_SELECTBOX_ID_CHANGE_POWER		13
+#define ED_SELECTBOX_ID_CUSTOM_SLIPPERY_TYPE	7
+#define ED_SELECTBOX_ID_CUSTOM_DEADLINESS	8
+#define ED_SELECTBOX_ID_CUSTOM_CONSISTENCY	9
+#define ED_SELECTBOX_ID_CHANGE_TIME_UNITS	10
+#define ED_SELECTBOX_ID_CHANGE_PLAYER_ACTION	11
+#define ED_SELECTBOX_ID_CHANGE_COLLIDE_ACTION	12
+#define ED_SELECTBOX_ID_CHANGE_OTHER_ACTION	13
+#define ED_SELECTBOX_ID_CHANGE_POWER		14
 
-#define ED_NUM_SELECTBOX			14
+#define ED_NUM_SELECTBOX			15
 
-#define ED_SELECTBOX_ID_CUSTOM_FIRST	ED_SELECTBOX_ID_CUSTOM_WALK_TO_ACTION
-#define ED_SELECTBOX_ID_CUSTOM_LAST	ED_SELECTBOX_ID_CUSTOM_ACCESS_LAYER
+#define ED_SELECTBOX_ID_CUSTOM_FIRST	ED_SELECTBOX_ID_CUSTOM_ACCESS_TYPE
+#define ED_SELECTBOX_ID_CUSTOM_LAST	ED_SELECTBOX_ID_CUSTOM_CONSISTENCY
 
 #define ED_SELECTBOX_ID_CHANGE_FIRST	ED_SELECTBOX_ID_CHANGE_TIME_UNITS
 #define ED_SELECTBOX_ID_CHANGE_LAST	ED_SELECTBOX_ID_CHANGE_POWER
@@ -556,39 +560,39 @@
 #define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED	2
 #define ED_CHECKBUTTON_ID_STICK_ELEMENT		3
 #define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS	4
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT	5
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE	6
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH	7
-#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT	8
-#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT	9
-#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY		10
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE	11
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL	12
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH	13
-#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY	14
-#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE	15
+#define ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE	5
+#define ED_CHECKBUTTON_ID_CUSTOM_WALK_TO_OBJECT	6
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_MOVE	7
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL	8
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH	9
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY	10
+#define ED_CHECKBUTTON_ID_CUSTOM_DEADLY		11
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT	12
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_FIRE	13
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_SMASH	14
+#define ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT	15
 #define ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC	16
-#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE	17
-#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE	18
-#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT	19
-#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION	20
-#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE	21
-#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM	22
-#define ED_CHECKBUTTON_ID_CHANGE_DELAY		23
-#define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER	24
-#define ED_CHECKBUTTON_ID_CHANGE_BY_COLLISION	25
-#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER	26
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_CHANGE	17
+#define ED_CHECKBUTTON_ID_CHANGE_DELAY		18
+#define ED_CHECKBUTTON_ID_CHANGE_BY_PLAYER	19
+#define ED_CHECKBUTTON_ID_CHANGE_BY_COLLISION	20
+#define ED_CHECKBUTTON_ID_CHANGE_BY_OTHER	21
+#define ED_CHECKBUTTON_ID_CHANGE_USE_EXPLOSION	22
+#define ED_CHECKBUTTON_ID_CHANGE_USE_CONTENT	23
+#define ED_CHECKBUTTON_ID_CHANGE_ONLY_COMPLETE	24
+#define ED_CHECKBUTTON_ID_CHANGE_USE_RANDOM	25
+#define ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE	26
 
 #define ED_NUM_CHECKBUTTONS			27
 
 #define ED_CHECKBUTTON_ID_LEVEL_FIRST	ED_CHECKBUTTON_ID_DOUBLE_SPEED
 #define ED_CHECKBUTTON_ID_LEVEL_LAST	ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
 
-#define ED_CHECKBUTTON_ID_CUSTOM_FIRST	ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_RESULT
-#define ED_CHECKBUTTON_ID_CUSTOM_LAST	ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_FIRST	ED_CHECKBUTTON_ID_CUSTOM_ACCESSIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_LAST	ED_CHECKBUTTON_ID_CUSTOM_EXPLODE_IMPACT
 
 #define ED_CHECKBUTTON_ID_CHANGE_FIRST	ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC
-#define ED_CHECKBUTTON_ID_CHANGE_LAST	ED_CHECKBUTTON_ID_CHANGE_BY_OTHER
+#define ED_CHECKBUTTON_ID_CHANGE_LAST	ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE
 
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE	0
@@ -881,6 +885,13 @@ static struct
     MAX_LEVEL_AUTHOR_LEN,
     level.author,
     "Author"
+  },
+  {
+    5 * MINI_TILEX,			5 * MINI_TILEY - ED_BORDER_SIZE,
+    GADGET_ID_ELEMENT_NAME,
+    MAX_ELEMENT_NAME_LEN - 2,		/* currently 2 chars less editable */
+    custom_element.description,
+    NULL
   }
 };
 
@@ -948,11 +959,23 @@ static struct ValueTextInfo options_move_stepsize[] =
 static struct ValueTextInfo options_smash_targets[] =
 {
   { EP_CAN_SMASH_PLAYER,	"player"			},
+#if 0
   { EP_CAN_SMASH_ENEMIES,	"enemies"			},
+#endif
   { EP_CAN_SMASH_EVERYTHING,	"everything"			},
   { -1,				NULL				}
 };
 
+static struct ValueTextInfo options_slippery_type[] =
+{
+  { SLIPPERY_ANY_RANDOM,	"random"			},
+  { SLIPPERY_ANY_LEFT_RIGHT,	"left, right"			},
+  { SLIPPERY_ANY_RIGHT_LEFT,	"right, left"			},
+  { SLIPPERY_ONLY_LEFT,		"only left"			},
+  { SLIPPERY_ONLY_RIGHT,	"only right"			},
+  { -1,				NULL				}
+};
+
 static struct ValueTextInfo options_deadliness[] =
 {
   { EP_DONT_RUN_INTO,		"running into"			},
@@ -1079,6 +1102,14 @@ static struct
     &custom_element.smash_targets,
     "can smash", NULL, "elements that can be smashed"
   },
+  {
+    ED_SETTINGS_XPOS(1),		ED_SETTINGS_YPOS(10),
+    GADGET_ID_CUSTOM_SLIPPERY_TYPE,
+    -1,
+    options_slippery_type,
+    &custom_element.slippery_type,
+    "slippery", NULL, "where other elements fall down"
+  },
   {
     ED_SETTINGS_XPOS(1),		ED_SETTINGS_YPOS(11),
     GADGET_ID_CUSTOM_DEADLINESS,
@@ -1358,7 +1389,7 @@ static struct
     ED_SETTINGS_XPOS(0),		ED_SETTINGS_YPOS(10),
     GADGET_ID_CUSTOM_SLIPPERY,
     &custom_element_properties[EP_SLIPPERY],
-    "slippery",				"other elements can fall down from it"
+    NULL,				"other elements can fall down from it"
   },
   {
     ED_SETTINGS_XPOS(0),		ED_SETTINGS_YPOS(11),
@@ -1491,6 +1522,7 @@ static void ModifyEditorCounter(int, int);
 static void ModifyEditorCounterLimits(int, int, int);
 static void ModifyEditorSelectbox(int, int);
 static void ModifyEditorElementList();
+static void RedrawDrawingElements();
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
@@ -2375,7 +2407,9 @@ static char *getElementInfoText(int element)
 
   if (element < NUM_FILE_ELEMENTS)
   {
-    if (element_info[element].custom_description != NULL)
+    if (strlen(element_info[element].description) > 0)
+      info_text = element_info[element].description;
+    else if (element_info[element].custom_description != NULL)
       info_text = element_info[element].custom_description;
     else if (element_info[element].editor_description != NULL)
       info_text = element_info[element].editor_description;
@@ -3422,9 +3456,12 @@ static void MapTextInputGadget(int id)
   int x = textinput_info[id].x + xoffset_above;
   int y = textinput_info[id].y + yoffset_above;
 
-  sprintf(infotext, "%s:", textinput_info[id].infotext);
-  infotext[max_infotext_len] = '\0';
-  DrawTextF(x, y, FONT_TEXT_1, infotext);
+  if (textinput_info[id].infotext)
+  {
+    sprintf(infotext, "%s:", textinput_info[id].infotext);
+    infotext[max_infotext_len] = '\0';
+    DrawTextF(x, y, FONT_TEXT_1, infotext);
+  }
 
   ModifyGadget(level_editor_gadget[textinput_info[id].gadget_id],
 	       GDI_TEXT_VALUE, textinput_info[id].value, GDI_END);
@@ -3556,6 +3593,9 @@ static void ResetUndoBuffer()
 
 static void DrawEditModeWindow()
 {
+  ModifyEditorElementList();
+  RedrawDrawingElements();
+
   if (edit_mode == ED_MODE_INFO)
     DrawLevelInfoWindow();
   else if (edit_mode == ED_MODE_PROPERTIES)
@@ -3571,7 +3611,7 @@ static boolean LevelChanged()
 
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
-      if (Feld[x][y] != Ur[x][y])
+      if (Feld[x][y] != level.field[x][y])
 	level_changed = TRUE;
 
   return level_changed;
@@ -3608,7 +3648,7 @@ static void CopyCustomElementPropertiesToEditor(int element)
   /* needed here to initialize combined element properties */
   InitElementPropertiesEngine(level.game_version);
 
-  custom_element = element_info[properties_element];
+  custom_element = element_info[element];
 
   for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
     custom_element_properties[i] = HAS_PROPERTY(element, i);
@@ -3716,7 +3756,23 @@ static void CopyCustomElementPropertiesToGame(int element)
   int i;
   int access_type_and_layer;
 
-  element_info[properties_element] = custom_element;
+  if (level.use_custom_template)
+  {
+    if (Request("Copy and modify level tem- plate ?", REQ_ASK))
+    {
+      level.use_custom_template = FALSE;
+      ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
+		   GDI_CHECKED, FALSE, GDI_END);
+    }
+    else
+    {
+      LoadLevelTemplate(-1);
+
+      DrawEditModeWindow();
+    }
+  }
+
+  element_info[element] = custom_element;
 
   /* ---------- element settings: configure (custom elements) ------------- */
 
@@ -3808,7 +3864,7 @@ static void CopyCustomElementPropertiesToGame(int element)
     SET_CHANGE_EVENT(element, i, custom_element_change_events[i]);
 
   /* copy change events also to special level editor variable */
-  custom_element = element_info[properties_element];
+  custom_element = element_info[element];
 }
 
 void DrawLevelEd()
@@ -3818,8 +3874,8 @@ void DrawLevelEd()
 
   if (level_editor_test_game)
   {
-    CopyPlayfield(Ur, Feld);
-    CopyPlayfield(FieldBackup, Ur);
+    CopyPlayfield(level.field, Feld);
+    CopyPlayfield(FieldBackup, level.field);
 
     level_editor_test_game = FALSE;
   }
@@ -3838,16 +3894,10 @@ void DrawLevelEd()
   BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
+#if 0
   /* draw mouse button brush elements */
-  DrawMiniGraphicExt(drawto,
-		     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		     el2edimg(new_element1));
-  DrawMiniGraphicExt(drawto,
-		     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		     el2edimg(new_element2));
-  DrawMiniGraphicExt(drawto,
-		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		     el2edimg(new_element3));
+  RedrawDrawingElements();
+#endif
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -3859,17 +3909,19 @@ void DrawLevelEd()
   redraw_mask |= REDRAW_ALL;
 
   ReinitializeElementListButtons();	/* only needed after setup changes */
+#if 0
   ModifyEditorElementList();		/* may be needed for custom elements */
+#endif
 
   UnmapTapeButtons();
   MapControlButtons();
 
+  DrawEditModeWindow();
+
   /* copy actual editor door content to door double buffer for OpenDoor() */
   BlitBitmap(drawto, bitmap_db_door,
 	     DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
-  DrawEditModeWindow();
-
   OpenDoor(DOOR_OPEN_1);
 }
 
@@ -4811,6 +4863,9 @@ static void DrawPropertiesConfig()
 
     /* draw drawing area gadgets */
     DrawCustomContentArea();
+
+    /* draw text input gadgets */
+    MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
   }
 }
 
@@ -4944,6 +4999,16 @@ static void DrawPropertiesWindow()
     DrawPropertiesAdvanced();
 }
 
+static void UpdateCustomElementGraphicGadgets()
+{
+  ModifyEditorElementList();
+  RedrawDrawingElements();
+
+  if (edit_mode == ED_MODE_PROPERTIES &&
+      edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED)
+    DrawPropertiesAdvancedDrawingAreas();
+}
+
 static void DrawLineElement(int sx, int sy, int element, boolean change_level)
 {
   int lx = sx + level_xpos;
@@ -5678,32 +5743,36 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	{
 	  new_element = GFX_ELEMENT(new_element);
 	  custom_element.gfx_element = new_element;
-	  element_info[properties_element] = custom_element;
 
-	  ModifyEditorElementList();
-	  RedrawDrawingElements();
+	  CopyCustomElementPropertiesToGame(properties_element);
+
+	  UpdateCustomElementGraphicGadgets();
 
 	  FrameCounter = 0;	/* restart animation frame counter */
 	}
 	else if (id == GADGET_ID_CUSTOM_CONTENT)
 	{
 	  custom_element.content[sx][sy] = new_element;
-	  element_info[properties_element] = custom_element;
+
+	  CopyCustomElementPropertiesToGame(properties_element);
 	}
 	else if (id == GADGET_ID_CUSTOM_CHANGE_TARGET)
 	{
 	  custom_element.change.target_element = new_element;
-	  element_info[properties_element] = custom_element;
+
+	  CopyCustomElementPropertiesToGame(properties_element);
 	}
 	else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
 	{
 	  custom_element.change.content[sx][sy] = new_element;
-	  element_info[properties_element] = custom_element;
+
+	  CopyCustomElementPropertiesToGame(properties_element);
 	}
 	else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
 	{
 	  custom_element.change.trigger_element = new_element;
-	  element_info[properties_element] = custom_element;
+
+	  CopyCustomElementPropertiesToGame(properties_element);
 	}
 	else if (id == GADGET_ID_RANDOM_BACKGROUND)
 	  random_placement_background_element = new_element;
@@ -5902,7 +5971,16 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
 static void HandleTextInputGadgets(struct GadgetInfo *gi)
 {
-  strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
+  int type_id = gi->custom_type_id;
+
+  strcpy(textinput_info[type_id].value, gi->text.value);
+
+  if (type_id == ED_TEXTINPUT_ID_ELEMENT_NAME)
+  {
+    CopyCustomElementPropertiesToGame(properties_element);
+
+    ModifyEditorElementList();	/* update changed button info text */
+  }
 }
 
 static void HandleSelectboxGadgets(struct GadgetInfo *gi)
@@ -5921,13 +5999,26 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
 
 static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
 {
-  if (gi->custom_type_id >= ED_TEXTBUTTON_ID_PROPERTIES_INFO &&
-      gi->custom_type_id <= ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED)
+  int type_id = gi->custom_type_id;
+
+  if (type_id >= ED_TEXTBUTTON_ID_PROPERTIES_INFO &&
+      type_id <= ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED)
   {
     edit_mode_properties = gi->custom_type_id;
 
     DrawPropertiesWindow();
   }
+  else if (type_id == ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE)
+  {
+    boolean new_template = (!LevelFileExists(-1));
+
+    if (new_template ||
+	Request("Save this tem- plate and kill the old ?", REQ_ASK))
+      SaveLevelTemplate();
+
+    if (new_template)
+      Request("Tem- plate saved !", REQ_CONFIRM);
+  }
 }
 
 static void HandleRadiobuttons(struct GadgetInfo *gi)
@@ -5945,15 +6036,31 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
   if ((type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST &&
        type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST) ||
       (type_id >= ED_CHECKBUTTON_ID_CHANGE_FIRST &&
-       type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST))
+       type_id <= ED_CHECKBUTTON_ID_CHANGE_LAST &&
+       type_id != ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE))
+  {
     CopyCustomElementPropertiesToGame(properties_element);
+  }
 
   if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_GRAPHIC)
   {
-    ModifyEditorElementList();
-    RedrawDrawingElements();
+    UpdateCustomElementGraphicGadgets();
+  }
+  else if (type_id == ED_CHECKBUTTON_ID_CUSTOM_USE_TEMPLATE)
+  {
+    if (level.use_custom_template && !LevelFileExists(-1))
+    {
+      Request("No level tem- plate found !", REQ_CONFIRM);
 
-    DrawPropertiesAdvancedDrawingAreas();
+      level.use_custom_template = FALSE;
+      ModifyGadget(gi, GDI_CHECKED, FALSE, GDI_END);
+
+      return;
+    }
+
+    LoadLevelTemplate(level.use_custom_template ? -1 : level_nr);
+
+    DrawEditModeWindow();
   }
 }
 
@@ -6201,12 +6308,18 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
-	if (Request("Save this level and kill the old ?", REQ_ASK))
+	boolean new_level = (!LevelFileExists(level_nr));
+
+	if (new_level ||
+	    Request("Save this level and kill the old ?", REQ_ASK))
 	{
-	  CopyPlayfield(Feld, Ur);
+	  CopyPlayfield(Feld, level.field);
 
 	  SaveLevel(level_nr);
 	}
+
+	if (new_level)
+	  Request("Level saved !", REQ_CONFIRM);
       }
       break;
 
@@ -6218,8 +6331,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	if (LevelChanged())
 	  level.game_version = GAME_VERSION_ACTUAL;
 
-	CopyPlayfield(Ur, FieldBackup);
-	CopyPlayfield(Feld, Ur);
+	CopyPlayfield(level.field, FieldBackup);
+	CopyPlayfield(Feld, level.field);
 
 	UnmapLevelEditorGadgets();
 	UndrawSpecialEditorDoor();