X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=9236f0a910ae59ed43758a5845921672d10bb7c4;hb=3e7289558277c65b6ddcbef0f663d100e7d237fc;hp=a544dfa11e59103b0da0ce89b225138d5d21c808;hpb=a5e9fc02d650da0520fc4994ba5780c27e4f3569;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index a544dfa1..9236f0a9 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -2039,7 +2039,11 @@ static struct
     ED_SETTINGS_XPOS(0),		ED_SETTINGS_YPOS(1),
     GADGET_ID_CUSTOM_USE_GRAPHIC,	GADGET_ID_NONE,
     &custom_element.use_gfx_element,
+#if 0
     NULL, "use graphic/sound of element:", "use existing graphic and sound"
+#else
+    NULL, "use graphic of element:",	"use existing element graphic"
+#endif
   },
   {
     ED_SETTINGS_XPOS(0),		ED_SETTINGS_YPOS(2),
@@ -5651,6 +5655,7 @@ static void copy_custom_element_settings(int element_from, int element_to)
     for (x = 0; x < 3; x++)
       ei_to->content[x][y] = ei_from->content[x][y];
 
+  ei_to->explosion_type = ei_from->explosion_type;
   ei_to->explosion_delay = ei_from->explosion_delay;
   ei_to->ignition_delay = ei_from->ignition_delay;
 
@@ -9064,7 +9069,15 @@ void HandleLevelEditorKeyInput(Key key)
 	{
 	  RequestExitLevelEditor(setup.ask_on_escape);
 	}
-        else
+        else if (edit_mode == ED_MODE_INFO)
+	{
+	  HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]);
+	}
+        else if (edit_mode == ED_MODE_PROPERTIES)
+	{
+	  HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
+	}
+	else		/* should never happen */
 	{
 	  DrawDrawingWindow();
 	  edit_mode = ED_MODE_DRAWING;