X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=86311c57cc985846a50c28ce36b66a0b710a9dc6;hb=c956237d7c5507aea649ce7b20c00d7bd9d37a7a;hp=e0ebdf2ae0428af83bbdec816550214a331c767b;hpb=e57078603232563176d90bb543ce2bc3a15b889e;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index e0ebdf2a..86311c57 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -22,6 +22,13 @@
 #include "game.h"
 #include "tape.h"
 
+
+/*
+  -----------------------------------------------------------------------------
+  screen and artwork graphic pixel position definitions
+  -----------------------------------------------------------------------------
+*/
+
 /* positions in the level editor */
 #define ED_WIN_MB_LEFT_XPOS		6
 #define ED_WIN_MB_LEFT_YPOS		258
@@ -30,25 +37,6 @@
 #define ED_WIN_MB_RIGHT_XPOS		78
 #define ED_WIN_MB_RIGHT_YPOS		ED_WIN_MB_LEFT_YPOS
 
-/* other constants for the editor */
-#define ED_SCROLL_NO			0
-#define ED_SCROLL_LEFT			1
-#define ED_SCROLL_RIGHT			2
-#define ED_SCROLL_UP			4
-#define ED_SCROLL_DOWN			8
-
-/* screens in the level editor */
-#define ED_MODE_DRAWING			0
-#define ED_MODE_INFO			1
-#define ED_MODE_PROPERTIES		2
-
-/* how many steps can be cancelled */
-#define NUM_UNDO_STEPS			(10 + 1)
-
-/* values for elements with score */
-#define MIN_SCORE			0
-#define MAX_SCORE			255
-
 /* values for the control window */
 #define ED_CTRL_BUTTONS_GFX_YPOS 	236
 #define ED_CTRL_BUTTONS_ALT_GFX_YPOS 	142
@@ -218,7 +206,18 @@
 #define ED_TEXTBUTTON_XSIZE		ED_WIN_COUNT_XSIZE
 #define ED_TEXTBUTTON_YSIZE		ED_WIN_COUNT_YSIZE
 
-/* editor gadget identifiers */
+/* values for ClearEditorGadgetInfoText() and HandleGadgetInfoText() */
+#define INFOTEXT_XPOS			SX
+#define INFOTEXT_YPOS			(SY + SYSIZE - MINI_TILEX + 2)
+#define INFOTEXT_XSIZE			SXSIZE
+#define INFOTEXT_YSIZE			MINI_TILEX
+
+
+/*
+  -----------------------------------------------------------------------------
+  editor gadget definitions
+  -----------------------------------------------------------------------------
+*/
 
 /* drawing toolbox buttons */
 #define GADGET_ID_NONE			-1
@@ -308,9 +307,9 @@
 /* textbutton identifiers */
 #define GADGET_ID_TEXTBUTTON_FIRST	(GADGET_ID_SELECTBOX_FIRST + 1)
 
-#define GADGET_ID_EDIT_PROPERTIES	(GADGET_ID_TEXTBUTTON_FIRST + 0)
-#define GADGET_ID_SHOW_DESCRIPTION	(GADGET_ID_TEXTBUTTON_FIRST + 1)
-#define GADGET_ID_EDIT_CUSTOM_CHANGE	(GADGET_ID_TEXTBUTTON_FIRST + 2)
+#define GADGET_ID_PROPERTIES_INFO	(GADGET_ID_TEXTBUTTON_FIRST + 0)
+#define GADGET_ID_PROPERTIES_CONFIG	(GADGET_ID_TEXTBUTTON_FIRST + 1)
+#define GADGET_ID_PROPERTIES_ADVANCED	(GADGET_ID_TEXTBUTTON_FIRST + 2)
 
 /* gadgets for scrolling of drawing area */
 #define GADGET_ID_SCROLLING_FIRST	(GADGET_ID_TEXTBUTTON_FIRST + 3)
@@ -411,9 +410,9 @@
 #define ED_NUM_SELECTBOX			1
 
 /* values for textbutton gadgets */
-#define ED_TEXTBUTTON_ID_EDIT_PROPERTIES	0
-#define ED_TEXTBUTTON_ID_SHOW_DESCRIPTION	1
-#define ED_TEXTBUTTON_ID_EDIT_CUSTOM_CHANGE	2
+#define ED_TEXTBUTTON_ID_PROPERTIES_INFO	0
+#define ED_TEXTBUTTON_ID_PROPERTIES_CONFIG	1
+#define ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED	2
 
 #define ED_NUM_TEXTBUTTON			3
 
@@ -446,15 +445,55 @@
 #define ED_RADIOBUTTON_ID_LEVEL_FIRST	ED_RADIOBUTTON_ID_PERCENTAGE
 #define ED_RADIOBUTTON_ID_LEVEL_LAST	ED_RADIOBUTTON_ID_QUANTITY
 
+
+/*
+  -----------------------------------------------------------------------------
+  some internally used definitions
+  -----------------------------------------------------------------------------
+*/
+
 /* values for CopyLevelToUndoBuffer() */
 #define UNDO_IMMEDIATE			0
 #define UNDO_ACCUMULATE			1
 
-/* values for ClearEditorGadgetInfoText() and HandleGadgetInfoText() */
-#define INFOTEXT_XPOS			SX
-#define INFOTEXT_YPOS			(SY + SYSIZE - MINI_TILEX + 2)
-#define INFOTEXT_XSIZE			SXSIZE
-#define INFOTEXT_YSIZE			MINI_TILEX
+/* values for scrollbars */
+#define ED_SCROLL_NO			0
+#define ED_SCROLL_LEFT			1
+#define ED_SCROLL_RIGHT			2
+#define ED_SCROLL_UP			4
+#define ED_SCROLL_DOWN			8
+
+/* screens in the level editor */
+#define ED_MODE_DRAWING			0
+#define ED_MODE_INFO			1
+#define ED_MODE_PROPERTIES		2
+
+/* sub-screens in the element properties section */
+#define ED_MODE_PROPERTIES_INFO		ED_TEXTBUTTON_ID_PROPERTIES_INFO
+#define ED_MODE_PROPERTIES_CONFIG	ED_TEXTBUTTON_ID_PROPERTIES_CONFIG
+#define ED_MODE_PROPERTIES_ADVANCED	ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED
+
+/* how many steps can be cancelled */
+#define NUM_UNDO_STEPS			(10 + 1)
+
+/* values for elements with score */
+#define MIN_SCORE			0
+#define MAX_SCORE			255
+
+/* values for random placement */
+#define RANDOM_USE_PERCENTAGE		0
+#define RANDOM_USE_QUANTITY		1
+
+/* maximal size of level editor drawing area */
+#define MAX_ED_FIELDX		(2 * SCR_FIELDX)
+#define MAX_ED_FIELDY		(2 * SCR_FIELDY - 1)
+
+
+/*
+  -----------------------------------------------------------------------------
+  some internally used data structure definitions
+  -----------------------------------------------------------------------------
+*/
 
 static struct
 {
@@ -486,24 +525,12 @@ static struct
   { 'E',	"exit level editor"		}
 };
 
-/* values for random placement */
-#define RANDOM_USE_PERCENTAGE		0
-#define RANDOM_USE_QUANTITY		1
-
 static int random_placement_value = 10;
 static int random_placement_method = RANDOM_USE_QUANTITY;
 static int random_placement_background_element = EL_SAND;
 static boolean random_placement_background_restricted = FALSE;
 static boolean stick_element_properties_window = FALSE;
-
-static struct
-{
-  boolean indestructible;
-  boolean can_fall;
-  boolean can_smash;
-  boolean pushable;
-  boolean slippery;
-} custom_element_properties[NUM_CUSTOM_ELEMENTS];
+static boolean custom_element_properties[NUM_ELEMENT_PROPERTIES];
 
 static struct
 {
@@ -568,7 +595,7 @@ static struct
     0,					255,
     GADGET_ID_LEVEL_TIMESCORE_DOWN,	GADGET_ID_LEVEL_TIMESCORE_UP,
     GADGET_ID_LEVEL_TIMESCORE_TEXT,
-    &level.score[SC_ZEITBONUS],
+    &level.score[SC_TIME_BONUS],
     "score for each 10 seconds left",	NULL
   },
   {
@@ -655,21 +682,21 @@ static struct
 {
   {
     ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(1),
-    GADGET_ID_EDIT_PROPERTIES,
-    11, "Properties",
-    "Edit element properties"
+    GADGET_ID_PROPERTIES_INFO,
+    11, "Information",
+    "Show information about element"
   },
   {
     ED_SETTINGS_XPOS + 166,		ED_COUNTER_YPOS(1),
-    GADGET_ID_SHOW_DESCRIPTION,
-    11, "Description",
-    "Show element description"
+    GADGET_ID_PROPERTIES_CONFIG,
+    11, "Configure",
+    "Configure element properties"
   },
   {
     ED_SETTINGS_XPOS + 332,		ED_COUNTER_YPOS(1),
-    GADGET_ID_EDIT_CUSTOM_CHANGE,
+    GADGET_ID_PROPERTIES_ADVANCED,
     11, "Advanced",
-    "Advanced element features"
+    "Advanced element configuration"
   },
 };
 
@@ -822,38 +849,41 @@ static struct
   {
     ED_SETTINGS_XPOS,			ED_COUNTER_YPOS2(10),
     GADGET_ID_CUSTOM_INDESTRUCTIBLE,
-    &custom_element_properties[0].indestructible,
+    &custom_element_properties[EP_INDESTRUCTIBLE],
     "indestructible",			"element cannot be destroyed"
   },
   {
     ED_SETTINGS_XPOS,			ED_COUNTER_YPOS2(11),
     GADGET_ID_CUSTOM_CAN_FALL,
-    &custom_element_properties[0].can_fall,
+    &custom_element_properties[EP_CAN_FALL],
     "can fall",				"element can fall down"
   },
   {
     ED_SETTINGS_XPOS,			ED_COUNTER_YPOS2(12),
     GADGET_ID_CUSTOM_CAN_SMASH,
-    &custom_element_properties[0].can_smash,
+    &custom_element_properties[EP_CAN_SMASH],
     "can smash",			"element can smash other elements"
   },
   {
     ED_SETTINGS_XPOS,			ED_COUNTER_YPOS2(13),
     GADGET_ID_CUSTOM_PUSHABLE,
-    &custom_element_properties[0].pushable,
+    &custom_element_properties[EP_PUSHABLE],
     "pushable",				"element can be pushed"
   },
   {
     ED_SETTINGS_XPOS,			ED_COUNTER_YPOS2(14),
     GADGET_ID_CUSTOM_SLIPPERY,
-    &custom_element_properties[0].slippery,
+    &custom_element_properties[EP_SLIPPERY],
     "slippery",				"other elements can fall down from it"
   }
 };
 
-/* maximal size of level editor drawing area */
-#define MAX_ED_FIELDX		(2 * SCR_FIELDX)
-#define MAX_ED_FIELDY		(2 * SCR_FIELDY - 1)
+
+/*
+  -----------------------------------------------------------------------------
+  some internally used variables
+  -----------------------------------------------------------------------------
+*/
 
 /* actual size of level editor drawing area */
 static int ed_fieldx = MAX_ED_FIELDX - 1, ed_fieldy = MAX_ED_FIELDY - 1;
@@ -904,6 +934,7 @@ static int undo_buffer_position = 0;
 static int undo_buffer_steps = 0;
 
 static int edit_mode;
+static int edit_mode_properties;
 
 static int element_shift = 0;
 
@@ -1678,6 +1709,13 @@ editor_elements_info[] =
     NULL								}
 };
 
+
+/*
+  -----------------------------------------------------------------------------
+  functions
+  -----------------------------------------------------------------------------
+*/
+
 static void ReinitializeElementList()
 {
   int pos = 0;
@@ -2762,67 +2800,20 @@ static void CopyPlayfield(short src[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
       dst[x][y] = src[x][y];
 }
 
-static void CopyCustomElementPropertiesToEditor()
+static void CopyCustomElementPropertiesToEditor(int element)
 {
   int i;
 
-  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
-  {
-    int element = EL_CUSTOM_START + i;
-    int properties = Properties1[element];
-
-    custom_element_properties[i].indestructible =
-      ((properties & EP_BIT_INDESTRUCTIBLE) != 0 ? TRUE : FALSE);
-
-    custom_element_properties[i].can_fall =
-      ((properties & EP_BIT_CAN_FALL) != 0 ? TRUE : FALSE);
-
-    custom_element_properties[i].can_smash =
-      ((properties & EP_BIT_CAN_SMASH) != 0 ? TRUE : FALSE);
-
-    custom_element_properties[i].pushable =
-      ((properties & EP_BIT_PUSHABLE) != 0 ? TRUE : FALSE);
-
-    custom_element_properties[i].slippery =
-      ((properties & EP_BIT_SLIPPERY) != 0 ? TRUE : FALSE);
-  }
+  for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
+    custom_element_properties[i] = HAS_PROPERTY(element, i);
 }
 
-static void CopyCustomElementPropertiesToGame()
+static void CopyCustomElementPropertiesToGame(int element)
 {
   int i;
 
-  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
-  {
-    int element = EL_CUSTOM_START + i;
-
-    Properties1[element] = EP_BITMASK_DEFAULT;
-
-    if (custom_element_properties[i].indestructible)
-      Properties1[element] |= EP_BIT_INDESTRUCTIBLE;
-    else
-      Properties1[element] &= ~EP_BIT_INDESTRUCTIBLE;
-
-    if (custom_element_properties[i].can_fall)
-      Properties1[element] |= EP_BIT_CAN_FALL;
-    else
-      Properties1[element] &= ~EP_BIT_CAN_FALL;
-
-    if (custom_element_properties[i].can_smash)
-      Properties1[element] |= EP_BIT_CAN_SMASH;
-    else
-      Properties1[element] &= ~EP_BIT_CAN_SMASH;
-
-    if (custom_element_properties[i].pushable)
-      Properties1[element] |= EP_BIT_PUSHABLE;
-    else
-      Properties1[element] &= ~EP_BIT_PUSHABLE;
-
-    if (custom_element_properties[i].slippery)
-      Properties1[element] |= EP_BIT_SLIPPERY;
-    else
-      Properties1[element] &= ~EP_BIT_SLIPPERY;
-  }
+  for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
+    SET_PROPERTY(element, i, custom_element_properties[i]);
 }
 
 void DrawLevelEd()
@@ -2840,8 +2831,10 @@ void DrawLevelEd()
   else
   {
     edit_mode = ED_MODE_DRAWING;
+    edit_mode_properties = ED_MODE_PROPERTIES_INFO;
 
     ResetUndoBuffer();
+
     level_xpos = -1;
     level_ypos = -1;
   }
@@ -3296,104 +3289,85 @@ static void DrawElementContentAreas()
 #define TEXT_SPEED		"Speed of amoeba growth"
 #define TEXT_DURATION		"Duration when activated"
 
-static void DrawPropertiesWindow()
+static struct
+{
+  int element;
+  int *value;
+  char *text;
+} elements_with_counter[] =
+{
+  { EL_EMERALD,		&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_BD_DIAMOND,	&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_EMERALD_YELLOW,	&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_EMERALD_RED,	&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_EMERALD_PURPLE,	&level.score[SC_EMERALD],	TEXT_COLLECTING	},
+  { EL_DIAMOND,		&level.score[SC_DIAMOND],	TEXT_COLLECTING	},
+  { EL_BUG_RIGHT,	&level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BUG_UP,		&level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BUG_LEFT,	&level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BUG_DOWN,	&level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BD_BUTTERFLY_RIGHT,&level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BD_BUTTERFLY_UP,   &level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BD_BUTTERFLY_LEFT, &level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_BD_BUTTERFLY_DOWN, &level.score[SC_BUG],		TEXT_SMASHING	},
+  { EL_SPACESHIP_RIGHT,	&level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_SPACESHIP_UP,	&level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_SPACESHIP_LEFT,	&level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_SPACESHIP_DOWN,	&level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_BD_FIREFLY_RIGHT,&level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_BD_FIREFLY_UP,	&level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_BD_FIREFLY_LEFT, &level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_BD_FIREFLY_DOWN, &level.score[SC_SPACESHIP],	TEXT_SMASHING	},
+  { EL_YAMYAM,		&level.score[SC_YAMYAM],	TEXT_SMASHING	},
+  { EL_DARK_YAMYAM,	&level.score[SC_YAMYAM],	TEXT_SMASHING	},
+  { EL_ROBOT,		&level.score[SC_ROBOT],		TEXT_SMASHING	},
+  { EL_PACMAN_RIGHT,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_PACMAN_UP,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_PACMAN_LEFT,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_PACMAN_DOWN,	&level.score[SC_PACMAN],	TEXT_SMASHING	},
+  { EL_NUT,		&level.score[SC_NUT],		TEXT_CRACKING	},
+  { EL_DYNAMITE,	&level.score[SC_DYNAMITE],	TEXT_COLLECTING	},
+  { EL_KEY_1,		&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_KEY_2,		&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_KEY_3,		&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_KEY_4,		&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_EM_KEY_1_FILE,	&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_EM_KEY_2_FILE,	&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_EM_KEY_3_FILE,	&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_EM_KEY_4_FILE,	&level.score[SC_KEY],		TEXT_COLLECTING	},
+  { EL_AMOEBA_WET,	&level.amoeba_speed,		TEXT_SPEED	},
+  { EL_AMOEBA_DRY,	&level.amoeba_speed,		TEXT_SPEED	},
+  { EL_AMOEBA_FULL,	&level.amoeba_speed,		TEXT_SPEED	},
+  { EL_BD_AMOEBA,	&level.amoeba_speed,		TEXT_SPEED	},
+  { EL_MAGIC_WALL,	&level.time_magic_wall,		TEXT_DURATION	},
+  { EL_ROBOT_WHEEL,	&level.time_wheel,		TEXT_DURATION	},
+  { -1,			NULL,				NULL		}
+};
+
+static boolean checkPropertiesConfig()
+{
+  int i;
+
+  if (IS_GEM(properties_element) ||
+      IS_CUSTOM_ELEMENT(properties_element) ||
+      HAS_CONTENT(properties_element))
+    return TRUE;
+  else
+    for (i=0; elements_with_counter[i].element != -1; i++)
+      if (elements_with_counter[i].element == properties_element)
+	return TRUE;
+
+  return FALSE;
+}
+
+static void DrawPropertiesConfig()
 {
   int counter_id = ED_COUNTER_ID_ELEM_SCORE;
-  int num_elements_in_level;
-  float percentage;
   int xoffset_right = getCounterGadgetWidth();
   int yoffset_right = ED_BORDER_SIZE;
   int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
   int yoffset_right2 = ED_BORDER_SIZE;
-  int xstart = 2;
-  int ystart = 4;
   int i, x, y;
-  static struct
-  {
-    int element;
-    int *value;
-    char *text;
-  } elements_with_counter[] =
-  {
-    { EL_EMERALD,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
-    { EL_BD_DIAMOND,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
-    { EL_EMERALD_YELLOW,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
-    { EL_EMERALD_RED,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
-    { EL_EMERALD_PURPLE,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
-    { EL_DIAMOND,	&level.score[SC_DIAMANT],	TEXT_COLLECTING },
-    { EL_BUG_RIGHT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUG_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUG_LEFT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUG_DOWN,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BD_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BD_BUTTERFLY_UP,   &level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BD_BUTTERFLY_LEFT, &level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BD_BUTTERFLY_DOWN, &level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_SPACESHIP_RIGHT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_SPACESHIP_UP,	 &level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_SPACESHIP_LEFT, &level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_SPACESHIP_DOWN, &level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_BD_FIREFLY_RIGHT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_BD_FIREFLY_UP,	  &level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_BD_FIREFLY_LEFT, &level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_BD_FIREFLY_DOWN, &level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_YAMYAM,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
-    { EL_DARK_YAMYAM,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
-    { EL_ROBOT,		&level.score[SC_ROBOT],		TEXT_SMASHING },
-    { EL_PACMAN_RIGHT,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_PACMAN_UP,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_PACMAN_LEFT,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_PACMAN_DOWN,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_NUT,		&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
-    { EL_DYNAMITE,	&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
-    { EL_KEY_1,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_KEY_2,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_KEY_3,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_KEY_4,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_EM_KEY_1_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_EM_KEY_2_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_EM_KEY_3_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_EM_KEY_4_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
-    { EL_AMOEBA_WET,	&level.amoeba_speed,		TEXT_SPEED },
-    { EL_AMOEBA_DRY,	&level.amoeba_speed,		TEXT_SPEED },
-    { EL_AMOEBA_FULL,	&level.amoeba_speed,		TEXT_SPEED },
-    { EL_BD_AMOEBA,	&level.amoeba_speed,		TEXT_SPEED },
-    { EL_MAGIC_WALL,	&level.time_magic_wall,		TEXT_DURATION },
-    { EL_ROBOT_WHEEL,	&level.time_wheel,		TEXT_DURATION },
-    { -1, NULL, NULL }
-  };
-
-  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
-  ClearWindow();
-  UnmapLevelEditorWindowGadgets();
-
-  DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
-	   "Element Settings", FONT_TITLE_1);
-
-  DrawElementBorder(SX + xstart * MINI_TILEX,
-		    SY + ystart * MINI_TILEY + MINI_TILEY / 2,
-		    TILEX, TILEY);
-  DrawGraphicAnimationExt(drawto,
-			  SX + xstart * MINI_TILEX,
-			  SY + ystart * MINI_TILEY + MINI_TILEY / 2,
-			  el2edimg(properties_element), -1, NO_MASKING);
-
-  FrameCounter = 0;	/* restart animation frame counter */
-
-  DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
-	    FONT_TEXT_1, getElementInfoText(properties_element));
-
-  num_elements_in_level = 0;
-  for (y=0; y<lev_fieldy; y++) 
-    for (x=0; x<lev_fieldx; x++)
-      if (Feld[x][y] == properties_element)
-	num_elements_in_level++;
-  percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
-
-  DrawTextF(ED_SETTINGS_XPOS, 5 * TILEY, FONT_TEXT_1, "In this level:");
-  DrawTextF(ED_SETTINGS_XPOS + 15 * getFontWidth(FONT_TEXT_1), 5 * TILEY,
-	    FONT_TEXT_2, "%d (%.2f%%)", num_elements_in_level,
-	    percentage);
 
   /* check if there are elements where a score can be chosen for */
   for (i=0; elements_with_counter[i].element != -1; i++)
@@ -3432,8 +3406,10 @@ static void DrawPropertiesWindow()
       else
 	DrawElementContentAreas();
     }
+#if 1
     else if (IS_CUSTOM_ELEMENT(properties_element))
       DrawCustomChangedArea();
+#endif
   }
 
   if (IS_GEM(properties_element))
@@ -3451,112 +3427,401 @@ static void DrawPropertiesWindow()
 
   if (IS_CUSTOM_ELEMENT(properties_element))
   {
-    int nr = properties_element - EL_CUSTOM_START;
+    CopyCustomElementPropertiesToEditor(properties_element);
 
-    CopyCustomElementPropertiesToEditor();
+    for (i =  ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE;
+	 i <= ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY; i++)
+    {
+      /* draw checkbutton gadget */
+      x = checkbutton_info[i].x + xoffset_right2;
+      y = checkbutton_info[i].y + yoffset_right2;
+
+      DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+      ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		   GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+      MapCheckbuttonGadget(i);
+    }
 
-    /* draw checkbutton gadget */
-    i = ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE;
-    x = checkbutton_info[i].x + xoffset_right2;
-    y = checkbutton_info[i].y + yoffset_right2;
+#if 1
+    /* draw selectbox gadget */
+    i = ED_SELECTBOX_ID_CUSTOM_CHANGE_CAUSE;
+    x = selectbox_info[i].x + xoffset_right2;
+    y = selectbox_info[i].y + yoffset_right2;
 
-    checkbutton_info[i].value = &custom_element_properties[nr].indestructible;
+    selectbox_info[i].index = &index_change_cause;
 
-    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
-    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
-		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
-    MapCheckbuttonGadget(i);
+    DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
+    ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
+		 GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
+    MapSelectboxGadget(i);
+#endif
+  }
+}
 
-    /* draw checkbutton gadget */
-    i = ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL;
-    x = checkbutton_info[i].x + xoffset_right2;
-    y = checkbutton_info[i].y + yoffset_right2;
+char *getElementDescriptionFilename(int element)
+{
+  char *docs_dir = options.docs_directory;
+  char *elements_subdir = "elements";
+  static char *filename = NULL;
+  char basename[MAX_FILENAME_LEN];
 
-    checkbutton_info[i].value = &custom_element_properties[nr].can_fall;
+  if (filename != NULL)
+    free(filename);
 
-    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
-    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
-		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
-    MapCheckbuttonGadget(i);
+  /* 1st try: look for element description file for exactly this element */
+  sprintf(basename, "%s.txt", element_info[element].token_name);
+  filename = getPath3(docs_dir, elements_subdir, basename);
+  if (fileExists(filename))
+    return filename;
 
-    /* draw checkbutton gadget */
-    i = ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH;
-    x = checkbutton_info[i].x + xoffset_right2;
-    y = checkbutton_info[i].y + yoffset_right2;
+  free(filename);
 
-    checkbutton_info[i].value = &custom_element_properties[nr].can_smash;
+  /* 2nd try: look for element description file for this element's class */
+  sprintf(basename, "%s.txt", element_info[element].class_name);
+  filename = getPath3(docs_dir, elements_subdir, basename);
+  if (fileExists(filename))
+    return filename;
 
-    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
-    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
-		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
-    MapCheckbuttonGadget(i);
+  return NULL;
+}
 
-    /* draw checkbutton gadget */
-    i = ED_CHECKBUTTON_ID_CUSTOM_PUSHABLE;
-    x = checkbutton_info[i].x + xoffset_right2;
-    y = checkbutton_info[i].y + yoffset_right2;
+static boolean PrintInfoText(char *text, int font_nr, int screen_line)
+{
+  int font_height = getFontHeight(font_nr);
+  int pad_x = ED_SETTINGS_XPOS;
+  int pad_y = 5 * TILEY;
+  int sx = SX + pad_x;
+  int sy = SY + pad_y;
+  int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1;
 
-    checkbutton_info[i].value = &custom_element_properties[nr].pushable;
+  if (screen_line >= max_lines_per_screen)
+    return FALSE;
 
-    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
-    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
-		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
-    MapCheckbuttonGadget(i);
+  DrawText(sx, sy + screen_line * font_height, text, font_nr);
 
-    /* draw checkbutton gadget */
-    i = ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY;
-    x = checkbutton_info[i].x + xoffset_right2;
-    y = checkbutton_info[i].y + yoffset_right2;
+  return TRUE;
+}
 
-    checkbutton_info[i].value = &custom_element_properties[nr].slippery;
+static int PrintElementDescriptionFromFile(char *filename, int screen_line)
+{
+  int font_nr = FONT_TEXT_2;
+  int font_width = getFontWidth(font_nr);
+  int pad_x = ED_SETTINGS_XPOS;
+  int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width;
+  char line[MAX_LINE_LEN];
+  char buffer[max_chars_per_line + 1];
+  int buffer_len;
+  int lines_printed = 0;
+  FILE *file;
+
+  if (filename == NULL)
+    return 0;
+
+  if (!(file = fopen(filename, MODE_READ)))
+    return 0;
+
+  buffer[0] = '\0';
+  buffer_len = 0;
+
+  while(!feof(file))
+  {
+    char *line_ptr, *word_ptr;
+    boolean last_line_was_empty = TRUE;
 
-    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
-    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
-		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
-    MapCheckbuttonGadget(i);
+    /* read next line of input file */
+    if (!fgets(line, MAX_LINE_LEN, file))
+      break;
 
-    /* draw selectbox gadget */
-    i = ED_SELECTBOX_ID_CUSTOM_CHANGE_CAUSE;
-    x = selectbox_info[i].x + xoffset_right2;
-    y = selectbox_info[i].y + yoffset_right2;
+    /* skip comments (lines directly beginning with '#') */
+    if (line[0] == '#')
+      continue;
 
-    selectbox_info[i].index = &index_change_cause;
+    /* cut trailing newline from input line */
+    for (line_ptr = line; *line_ptr; line_ptr++)
+    {
+      if (*line_ptr == '\n' || *line_ptr == '\r')
+      {
+	*line_ptr = '\0';
+	break;
+      }
+    }
 
-    DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
-    ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
-		 GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
-    MapSelectboxGadget(i);
+    if (strlen(line) == 0)		/* special case: force empty line */
+      strcpy(line, "\n");
+
+    word_ptr = line;
+
+    while (*word_ptr)
+    {
+      boolean print_buffer = FALSE;
+      int word_len;
+
+      /* skip leading whitespaces */
+      while (*word_ptr == ' ' || *word_ptr == '\t')
+	word_ptr++;
+
+      line_ptr = word_ptr;
+      word_len = 0;
+
+      /* look for end of next word */
+      while (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
+      {
+	line_ptr++;
+	word_len++;
+      }
+
+      if (word_len == 0)
+      {
+	continue;
+      }
+      else if (*word_ptr == '\n')	/* special case: force empty line */
+      {
+	if (buffer_len == 0)
+	  word_ptr++;
+
+	/* prevent printing of multiple empty lines */
+	if (buffer_len > 0 || !last_line_was_empty)
+	  print_buffer = TRUE;
+      }
+      else if (word_len < max_chars_per_line - buffer_len)
+      {
+	/* word fits into text buffer -- add word */
+
+	if (buffer_len > 0)
+	  buffer[buffer_len++] = ' ';
+
+	strncpy(&buffer[buffer_len], word_ptr, word_len);
+	buffer_len += word_len;
+	buffer[buffer_len] = '\0';
+	word_ptr += word_len;
+      }
+      else if (buffer_len > 0)
+      {
+	/* not enough space left for word in text buffer -- print buffer */
+
+	print_buffer = TRUE;
+      }
+      else
+      {
+	/* word does not fit at all into empty text buffer -- cut word */
+
+	strncpy(buffer, word_ptr, max_chars_per_line);
+	buffer[max_chars_per_line] = '\0';
+	word_ptr += max_chars_per_line;
+	print_buffer = TRUE;
+      }
+
+      if (print_buffer)
+      {
+	if (!PrintInfoText(buffer, font_nr, screen_line + lines_printed))
+	  return lines_printed;
+
+	last_line_was_empty = (buffer_len == 0);
+	lines_printed++;
+
+	buffer[0] = '\0';
+	buffer_len = 0;
+	print_buffer = FALSE;
+      }
+    }
   }
 
-  /* draw textbutton gadget */
-  i = ED_TEXTBUTTON_ID_EDIT_PROPERTIES;
-  x = textbutton_info[i].x + xoffset_right2;
-  y = textbutton_info[i].y + yoffset_right2;
+  fclose(file);
 
-  ModifyGadget(level_editor_gadget[textbutton_info[i].gadget_id],
-	       GDI_ACTIVE, FALSE, GDI_END);
-  MapTextbuttonGadget(i);
+  if (buffer_len > 0)
+    if (PrintInfoText(buffer, font_nr, screen_line + lines_printed))
+      lines_printed++;
 
-  /* draw textbutton gadget */
-  i = ED_TEXTBUTTON_ID_SHOW_DESCRIPTION;
-  x = textbutton_info[i].x + xoffset_right2;
-  y = textbutton_info[i].y + yoffset_right2;
+  return lines_printed;
+}
 
-  ModifyGadget(level_editor_gadget[textbutton_info[i].gadget_id],
-	       GDI_ACTIVE, TRUE, GDI_END);
-  MapTextbuttonGadget(i);
+static void DrawPropertiesTabulatorGadgets()
+{
+  struct GadgetInfo *gd_gi = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
+  struct GadgetDesign *gd = &gd_gi->alt_design[GD_BUTTON_UNPRESSED];
+  int gd_x = gd->x + gd_gi->border.width / 2;
+  int gd_y = gd->y + gd_gi->height - 1;
+  Pixel line_color = GetPixel(gd->bitmap, gd_x, gd_y);
+  int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
+  int id_last  = ED_TEXTBUTTON_ID_PROPERTIES_INFO;
+  int i;
 
+  /* draw additional "configure" tabulator for configurable elements */
+  if (checkPropertiesConfig())
+    id_last = ED_TEXTBUTTON_ID_PROPERTIES_CONFIG;
+
+  /* draw additional "advanced" tabulator for custom elements */
   if (IS_CUSTOM_ELEMENT(properties_element))
+    id_last = ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED;
+
+  for (i=id_first; i <= id_last; i++)
   {
-    /* draw textbutton gadget */
-    i = ED_TEXTBUTTON_ID_EDIT_CUSTOM_CHANGE;
-    x = textbutton_info[i].x + xoffset_right2;
-    y = textbutton_info[i].y + yoffset_right2;
+    int gadget_id = textbutton_info[i].gadget_id;
+    struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+    boolean active = (i != edit_mode_properties);
+    Pixel color = (active ? BLACK_PIXEL : line_color);
+
+    /* draw solid or black line below tabulator button */
+    FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width, 1, color);
 
-    ModifyGadget(level_editor_gadget[textbutton_info[i].gadget_id],
-		 GDI_ACTIVE, TRUE, GDI_END);
+    ModifyGadget(gi, GDI_ACTIVE, active, GDI_END);
     MapTextbuttonGadget(i);
   }
+
+  /* draw little border line below tabulator buttons */
+  FillRectangle(drawto, gd_gi->x, gd_gi->y + gd_gi->height + 1,
+		3 * gd_gi->width + 2 * ED_GADGET_DISTANCE, ED_GADGET_DISTANCE,
+		line_color);
+}
+
+static void DrawPropertiesInfo()
+{
+  static struct
+  {
+    int value;
+    char *text;
+  }
+  properties[] =
+  {
+    { EP_AMOEBALIVE,		"- living amoeba"		},
+    { EP_AMOEBOID,		"- amoeboid"			},
+    { EP_INDESTRUCTIBLE,	"- undestructible"		},
+    { EP_SLIPPERY,		"- slippery"			},
+    { EP_ENEMY,			"- enemy"			},
+    { EP_CAN_FALL,		"- can fall"			},
+    { EP_CAN_SMASH,		"- can smash"			},
+    { EP_CAN_CHANGE,		"- can change"			},
+    { EP_CAN_MOVE,		"- can move"			},
+    { EP_COULD_MOVE,		"- could move"			},
+    { EP_DONT_TOUCH,		"- don't touch"			},
+    { EP_DONT_GO_TO,		"- don't go to"			},
+    { EP_FOOD_DARK_YAMYAM,	"- food for dark yamyam"	},
+    { EP_BD_ELEMENT,		"- BD style"			},
+    { EP_SB_ELEMENT,		"- SB style"			},
+    { EP_GEM,			"- gem"				},
+    { EP_INACTIVE,		"- inactive"			},
+    { EP_EXPLOSIVE,		"- explosive"			},
+    { EP_FOOD_PENGUIN,		"- food for penguin"		},
+    { EP_PUSHABLE,		"- pushable"			},
+    { EP_PLAYER,		"- player"			},
+    { EP_HAS_CONTENT,		"- has content"			},
+    { EP_DIGGABLE,		"- diggable"			},
+    { EP_SP_ELEMENT,		"- SB style"			},
+    { EP_WALKABLE_INSIDE,	"- walkable inside"		},
+    { EP_ACTIVE_BOMB,		"- active bomb"			},
+    { EP_BELT,			"- belt"			},
+    { EP_BELT_ACTIVE,		"- active belt"			},
+    { EP_BELT_SWITCH,		"- belt switch"			},
+    { EP_WALKABLE_UNDER,	"- walkable under"		},
+    { EP_EM_SLIPPERY_WALL,	"- EM style slippery wall"	},
+    { EP_CAN_BE_CRUMBLED,	"- can be crumbled"		},
+    { -1,			NULL				}
+  };
+  char *filename = getElementDescriptionFilename(properties_element);
+  char *percentage_text = "In this level:";
+  char *properties_text = "Standard properties:";
+  float percentage;
+  int num_elements_in_level;
+  int num_standard_properties = 0;
+  int font1_nr = FONT_TEXT_1;
+  int font2_nr = FONT_TEXT_2;
+  int font1_width = getFontWidth(font1_nr);
+  int font2_height = getFontHeight(font2_nr);
+  int pad_x = ED_SETTINGS_XPOS;
+  int pad_y = 5 * TILEY;
+  int screen_line = 2;
+  int i, x, y;
+
+  num_elements_in_level = 0;
+  for (y=0; y<lev_fieldy; y++) 
+    for (x=0; x<lev_fieldx; x++)
+      if (Feld[x][y] == properties_element)
+	num_elements_in_level++;
+  percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
+
+  DrawTextF(pad_x, pad_y, font1_nr, percentage_text);
+  DrawTextF(pad_x + strlen(percentage_text) * font1_width, pad_y,
+	    font2_nr, "%d (%.2f%%)", num_elements_in_level, percentage);
+
+  for (i=0; properties[i].value != -1; i++)
+    if (HAS_PROPERTY(properties_element, properties[i].value))
+      num_standard_properties++;
+
+#if 1
+  if (num_standard_properties > 0)
+  {
+    DrawTextF(pad_x, pad_y + screen_line * font2_height, font1_nr,
+	      properties_text);
+    screen_line++;
+
+    for (i=0; properties[i].value != -1; i++)
+    {
+      if (!HAS_PROPERTY(properties_element, properties[i].value))
+	continue;
+
+      DrawTextF(pad_x, pad_y + screen_line * font2_height, font2_nr,
+		properties[i].text);
+      screen_line++;
+    }
+
+    screen_line++;
+  }
+#endif
+
+  PrintInfoText("Description:", FONT_TEXT_1, screen_line);
+  if (PrintElementDescriptionFromFile(filename, screen_line + 1) == 0)
+    PrintInfoText("No description available.", FONT_TEXT_1, screen_line);
+}
+
+static void DrawPropertiesAdvanced()
+{
+  DrawText(SX + ED_SETTINGS_XPOS, SY + 5 * TILEY,
+	   "Under construction! :-)", FONT_TEXT_1);
+}
+
+static void DrawPropertiesWindow()
+{
+  int xstart = 2;
+  int ystart = 4;
+
+  /* make sure that previous properties edit mode exists for this element */
+  if (edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED &&
+      !IS_CUSTOM_ELEMENT(properties_element))
+    edit_mode_properties = ED_MODE_PROPERTIES_CONFIG;
+
+  if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG &&
+      !checkPropertiesConfig())
+    edit_mode_properties = ED_MODE_PROPERTIES_INFO;
+
+  UnmapLevelEditorWindowGadgets();
+
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
+  ClearWindow();
+
+  DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
+	   "Element Settings", FONT_TITLE_1);
+
+  DrawElementBorder(SX + xstart * MINI_TILEX,
+		    SY + ystart * MINI_TILEY + MINI_TILEY / 2,
+		    TILEX, TILEY);
+  DrawGraphicAnimationExt(drawto,
+			  SX + xstart * MINI_TILEX,
+			  SY + ystart * MINI_TILEY + MINI_TILEY / 2,
+			  el2img(properties_element), -1, NO_MASKING);
+
+  FrameCounter = 0;	/* restart animation frame counter */
+
+  DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
+	    FONT_TEXT_1, getElementInfoText(properties_element));
+
+  DrawPropertiesTabulatorGadgets();
+
+  if (edit_mode_properties == ED_MODE_PROPERTIES_INFO)
+    DrawPropertiesInfo();
+  else if (edit_mode_properties == ED_MODE_PROPERTIES_CONFIG)
+    DrawPropertiesConfig();
+  else	/* edit_mode_properties == ED_MODE_PROPERTIES_ADVANCED */
+    DrawPropertiesAdvanced();
 }
 
 static void DrawLineElement(int sx, int sy, int element, boolean change_level)
@@ -4482,20 +4747,13 @@ static void HandleSelectboxGadgets(struct GadgetInfo *gi)
 
 static void HandleTextbuttonGadgets(struct GadgetInfo *gi)
 {
-  int i;
-
-  for (i=0; i<ED_NUM_TEXTBUTTON; i++)
+  if (gi->custom_type_id >= ED_TEXTBUTTON_ID_PROPERTIES_INFO &&
+      gi->custom_type_id <= ED_TEXTBUTTON_ID_PROPERTIES_ADVANCED)
   {
-    struct GadgetInfo *gii = level_editor_gadget[textbutton_info[i].gadget_id];
-    boolean active = (gii->custom_type_id != gi->custom_type_id);
+    edit_mode_properties = gi->custom_type_id;
 
-    ModifyGadget(level_editor_gadget[textbutton_info[i].gadget_id],
-		 GDI_ACTIVE, active, GDI_END);
+    DrawPropertiesWindow();
   }
-
-#if 0
-  printf("text button %d pressed\n", gi->custom_type_id);
-#endif
 }
 
 static void HandleRadiobuttons(struct GadgetInfo *gi)
@@ -4512,7 +4770,7 @@ static void HandleCheckbuttons(struct GadgetInfo *gi)
 
   if (type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST &&
       type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST)
-    CopyCustomElementPropertiesToGame();
+    CopyCustomElementPropertiesToGame(properties_element);
 }
 
 static void HandleControlButtons(struct GadgetInfo *gi)
@@ -4923,7 +5181,7 @@ void HandleLevelEditorIdle()
   DrawGraphicAnimationExt(drawto,
 			  SX + xpos * TILEX,
 			  SY + ypos * TILEY + MINI_TILEY / 2,
-			  el2edimg(properties_element), -1, NO_MASKING);
+			  el2img(properties_element), -1, NO_MASKING);
 
   MarkTileDirty(xpos, ypos);
   MarkTileDirty(xpos, ypos + 1);