X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=ee201420d2029dd184f33028da5db76702b1e0e0;hb=78ec772d11cb8823d8dca05c227b472da8708a07;hp=a74d702c58d2c19539b79bcdac92ecd1380f415f;hpb=c1d1d669f782d9af7dfa71159962d5a89c62f03b;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index a74d702c..ee201420 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -51,10 +51,6 @@
 #define MIN_SCORE			0
 #define MAX_SCORE			255
 
-/* values for elements with content */
-#define MIN_ELEM_CONTENT		1
-#define MAX_ELEM_CONTENT		8
-
 /* values for the control window */
 #define ED_CTRL_BUTTONS_GFX_YPOS 	236
 #define ED_CTRL_BUTTONS_ALT_GFX_YPOS 	142
@@ -158,9 +154,25 @@
 #define ED_CHECKBUTTON_YPOS		(ED_BUTTON_MINUS_YPOS + 22)
 #define ED_STICKYBUTTON_YPOS		(ED_BUTTON_MINUS_YPOS + 88)
 
-#define GADGET_ID_NONE			-1
+/* some positions in the editor control window */
+#define ED_BUTTON_ELEM_XPOS	6
+#define ED_BUTTON_ELEM_YPOS	30
+#define ED_BUTTON_ELEM_XSIZE	22
+#define ED_BUTTON_ELEM_YSIZE	22
+
+#define ED_BUTTON_MINUS_XPOS	2
+#define ED_BUTTON_MINUS_YPOS	ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_MINUS_XSIZE	ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_MINUS_YSIZE	ED_BUTTON_COUNT_YSIZE
+#define ED_BUTTON_PLUS_XPOS	(ED_WIN_COUNT_XPOS + ED_WIN_COUNT_XSIZE + 2)
+#define ED_BUTTON_PLUS_YPOS	ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_PLUS_XSIZE	ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_PLUS_YSIZE	ED_BUTTON_COUNT_YSIZE
+
+/* editor gadget identifiers */
 
 /* drawing toolbox buttons */
+#define GADGET_ID_NONE			-1
 #define GADGET_ID_SINGLE_ITEMS		0
 #define GADGET_ID_CONNECTED_ITEMS	1
 #define GADGET_ID_LINE			2
@@ -285,6 +297,9 @@
 
 #define ED_NUM_SCROLLBUTTONS		6
 
+#define ED_SCROLLBUTTON_ID_AREA_FIRST	ED_SCROLLBUTTON_ID_AREA_UP
+#define ED_SCROLLBUTTON_ID_AREA_LAST	ED_SCROLLBUTTON_ID_AREA_RIGHT
+
 /* values for scrollbar gadgets */
 #define ED_SCROLLBAR_ID_HORIZONTAL	0
 #define ED_SCROLLBAR_ID_VERTICAL	1
@@ -313,7 +328,7 @@
 
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE	0
-#define ED_RADIOBUTTON_ID_QUANTITY		1
+#define ED_RADIOBUTTON_ID_QUANTITY	1
 
 #define ED_NUM_RADIOBUTTONS		2
 
@@ -361,15 +376,15 @@ static struct
   { 'E', "exit level editor" }
 };
 
-/* pointers to counter values */
-static int *gadget_elem_score_value = NULL;
-static int *gadget_elem_content_value = NULL;
-static int *gadget_level_xsize_value = NULL;
-static int *gadget_level_ysize_value = NULL;
-static int *gadget_level_random_value = NULL;
-static int *gadget_level_collect_value = NULL;
-static int *gadget_level_timelimit_value = NULL;
-static int *gadget_level_timescore_value = NULL;
+/* 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_ERDREICH;
+static boolean random_placement_background_restricted = FALSE;
+static boolean stick_element_properties_window = FALSE;
 
 static struct
 {
@@ -377,7 +392,7 @@ static struct
   int min_value, max_value;
   int gadget_id_down, gadget_id_up;
   int gadget_id_text;
-  int **counter_value;
+  int *value;
   char *infotext_above, *infotext_right;
 } counterbutton_info[ED_NUM_COUNTERBUTTONS] =
 {
@@ -386,15 +401,15 @@ static struct
     MIN_SCORE,				MAX_SCORE,
     GADGET_ID_ELEM_SCORE_DOWN,		GADGET_ID_ELEM_SCORE_UP,
     GADGET_ID_ELEM_SCORE_TEXT,
-    &gadget_elem_score_value,
+    NULL,				/* will be set when used */
     "element score",			NULL
   },
   {
     ED_COUNT_ELEM_CONTENT_XPOS,		ED_COUNT_ELEM_CONTENT_YPOS,
-    MIN_ELEM_CONTENT,			MAX_ELEM_CONTENT,
+    MIN_ELEMENT_CONTENTS,		MAX_ELEMENT_CONTENTS,
     GADGET_ID_ELEM_CONTENT_DOWN,	GADGET_ID_ELEM_CONTENT_UP,
     GADGET_ID_ELEM_CONTENT_TEXT,
-    &gadget_elem_content_value,
+    &level.num_yam_contents,
     "element content",			NULL
   },
   {
@@ -402,7 +417,7 @@ static struct
     MIN_LEV_FIELDX,			MAX_LEV_FIELDX,
     GADGET_ID_LEVEL_XSIZE_DOWN,		GADGET_ID_LEVEL_XSIZE_UP,
     GADGET_ID_LEVEL_XSIZE_TEXT,
-    &gadget_level_xsize_value,
+    &level.fieldx,
     "playfield size",			"width",
   },
   {
@@ -410,7 +425,7 @@ static struct
     MIN_LEV_FIELDY,			MAX_LEV_FIELDY,
     GADGET_ID_LEVEL_YSIZE_DOWN,		GADGET_ID_LEVEL_YSIZE_UP,
     GADGET_ID_LEVEL_YSIZE_TEXT,
-    &gadget_level_ysize_value,
+    &level.fieldy,
     NULL,				"height",
   },
   {
@@ -418,7 +433,7 @@ static struct
     0,					999,
     GADGET_ID_LEVEL_COLLECT_DOWN,	GADGET_ID_LEVEL_COLLECT_UP,
     GADGET_ID_LEVEL_COLLECT_TEXT,
-    &gadget_level_collect_value,
+    &level.gems_needed,
     "number of emeralds to collect",	NULL
   },
   {
@@ -426,7 +441,7 @@ static struct
     0,					999,
     GADGET_ID_LEVEL_TIMELIMIT_DOWN,	GADGET_ID_LEVEL_TIMELIMIT_UP,
     GADGET_ID_LEVEL_TIMELIMIT_TEXT,
-    &gadget_level_timelimit_value,
+    &level.time,
     "time available to solve level",	"(0 => no time limit)"
   },
   {
@@ -434,7 +449,7 @@ static struct
     0,					255,
     GADGET_ID_LEVEL_TIMESCORE_DOWN,	GADGET_ID_LEVEL_TIMESCORE_UP,
     GADGET_ID_LEVEL_TIMESCORE_TEXT,
-    &gadget_level_timescore_value,
+    &level.score[SC_ZEITBONUS],
     "score for each 10 seconds left",	NULL
   },
   {
@@ -442,7 +457,7 @@ static struct
     1,					100,
     GADGET_ID_LEVEL_RANDOM_DOWN,	GADGET_ID_LEVEL_RANDOM_UP,
     GADGET_ID_LEVEL_RANDOM_TEXT,
-    &gadget_level_random_value,
+    &random_placement_value,
     "random element placement",		"in"
   }
 };
@@ -546,16 +561,6 @@ static struct
   }
 };
 
-/* 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_ERDREICH;
-static boolean random_placement_background_restricted = FALSE;
-static boolean stick_element_properties_window = FALSE;
-
 static struct
 {
   int x, y;
@@ -636,17 +641,20 @@ static int new_element3 = EL_ERDREICH;
 #define BUTTON_ELEMENT(button) (button == 1 ? new_element1 : \
 				button == 2 ? new_element2 : \
 				button == 3 ? new_element3 : EL_LEERRAUM)
+#define BUTTON_STEPSIZE(button) (button == 1 ? 1 : button == 2 ? 5 : 10)
 
 /* forward declaration for internal use */
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
 static void CopyLevelToUndoBuffer(int);
-static void HandleControlButtons(struct GadgetInfo *);
-static void HandleCounterButtons(struct GadgetInfo *);
 static void HandleDrawingAreas(struct GadgetInfo *);
-static void HandleDrawingAreaInfo(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
 static void HandleTextInputGadgets(struct GadgetInfo *);
+static void HandleRadiobuttons(struct GadgetInfo *);
+static void HandleCheckbuttons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
+static void HandleDrawingAreaInfo(struct GadgetInfo *);
 
 static struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
 
@@ -655,7 +663,7 @@ static int last_drawing_function = GADGET_ID_SINGLE_ITEMS;
 static boolean draw_with_brush = FALSE;
 static int properties_element = 0;
 
-static short ElementContent[MAX_ELEM_CONTENT][3][3];
+static short ElementContent[MAX_ELEMENT_CONTENTS][3][3];
 static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static int undo_buffer_position = 0;
@@ -1159,6 +1167,7 @@ static void CreateControlButtons()
     gd_y2  = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, control_info[i].text,
 		      GDI_X, EX + gd_xoffset,
 		      GDI_Y, EY + gd_yoffset,
@@ -1216,9 +1225,10 @@ static void CreateControlButtons()
       gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
       gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
       gd_y2 = gd_y1;
-   }
+    }
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
 		      GDI_X, x,
 		      GDI_Y, y,
@@ -1264,6 +1274,7 @@ static void CreateControlButtons()
     deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, element_info[editor_element[i]],
 		      GDI_X, DX + gd_xoffset,
 		      GDI_Y, DY + gd_yoffset,
@@ -1321,6 +1332,7 @@ static void CreateCounterButtons()
 	      (j == 0 ? "decrease" : "increase"));
 
       gi = CreateGadget(GDI_CUSTOM_ID, id,
+			GDI_CUSTOM_TYPE_ID, i,
 			GDI_INFO_TEXT, infotext,
 			GDI_X, xpos,
 			GDI_Y, ypos,
@@ -1349,6 +1361,7 @@ static void CreateCounterButtons()
 	gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
 
 	gi = CreateGadget(GDI_CUSTOM_ID, id,
+			  GDI_CUSTOM_TYPE_ID, i,
 			  GDI_INFO_TEXT, "enter counter value",
 			  GDI_X, xpos,
 			  GDI_Y, ypos,
@@ -1404,13 +1417,14 @@ static void CreateDrawingAreas()
   level_editor_gadget[id] = gi;
 
   /* ... up to eight areas for element content ... */
-  for (i=0; i<MAX_ELEM_CONTENT; i++)
+  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
   {
     int gx = SX + ED_AREA_ELEM_CONTENT_XPOS + 5 * (i % 4) * MINI_TILEX;
     int gy = SX + ED_AREA_ELEM_CONTENT_YPOS + 6 * (i / 4) * MINI_TILEY;
 
     id = GADGET_ID_ELEM_CONTENT_0 + i;
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_X, gx,
 		      GDI_Y, gy,
 		      GDI_WIDTH, 3 * MINI_TILEX,
@@ -1490,6 +1504,7 @@ static void CreateTextInputGadgets()
     infotext[MAX_INFOTEXT_LEN] = '\0';
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, infotext,
 		      GDI_X, SX + textinput_info[i].x,
 		      GDI_Y, SY + textinput_info[i].y,
@@ -1544,6 +1559,7 @@ static void CreateScrollbarGadgets()
     gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, scrollbar_info[i].infotext,
 		      GDI_X, SX + scrollbar_info[i].x,
 		      GDI_Y, SY + scrollbar_info[i].y,
@@ -1593,6 +1609,7 @@ static void CreateCheckbuttonGadgets()
       (*radiobutton_info[i].value == radiobutton_info[i].checked_value);
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, radiobutton_info[i].infotext,
 		      GDI_X, SX + radiobutton_info[i].x,
 		      GDI_Y, SY + radiobutton_info[i].y,
@@ -1606,7 +1623,7 @@ static void CreateCheckbuttonGadgets()
 		      GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x3, gd_y,
 		      GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x4, gd_y,
 		      GDI_EVENT_MASK, event_mask,
-		      GDI_CALLBACK_ACTION, HandleControlButtons,
+		      GDI_CALLBACK_ACTION, HandleRadiobuttons,
 		      GDI_END);
 
     if (gi == NULL)
@@ -1625,6 +1642,7 @@ static void CreateCheckbuttonGadgets()
       gd_y  = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, checkbutton_info[i].infotext,
 		      GDI_X, SX + checkbutton_info[i].x,
 		      GDI_Y, SY + checkbutton_info[i].y,
@@ -1637,7 +1655,7 @@ static void CreateCheckbuttonGadgets()
 		      GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x3, gd_y,
 		      GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x4, gd_y,
 		      GDI_EVENT_MASK, event_mask,
-		      GDI_CALLBACK_ACTION, HandleControlButtons,
+		      GDI_CALLBACK_ACTION, HandleCheckbuttons,
 		      GDI_END);
 
     if (gi == NULL)
@@ -1665,6 +1683,8 @@ static void MapControlButtons()
     MapGadget(level_editor_gadget[i]);
   for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
     MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
+  MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_UP]);
+  MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_DOWN]);
 }
 
 static void MapCounterButtons(int id)
@@ -1700,7 +1720,7 @@ static void MapMainDrawingArea()
   boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
   int i;
 
-  for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+  for (i=ED_SCROLLBUTTON_ID_AREA_FIRST; i<=ED_SCROLLBUTTON_ID_AREA_LAST; i++)
   {
     if (((i == ED_SCROLLBUTTON_ID_AREA_LEFT ||
 	  i == ED_SCROLLBUTTON_ID_AREA_RIGHT) &&
@@ -1749,16 +1769,15 @@ void UnmapLevelEditorGadgets()
 
 void DrawLevelEd()
 {
-  int i, x, y, graphic;
-
   edit_mode = ED_MODE_DRAWING;
 
   CloseDoor(DOOR_CLOSE_ALL);
-
   OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
 
   if (level_editor_test_game)
   {
+    int x, y;
+
     for(x=0; x<lev_fieldx; x++)
       for(y=0; y<lev_fieldy; y++)
 	Feld[x][y] = Ur[x][y];
@@ -1778,70 +1797,39 @@ void DrawLevelEd()
     CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
   }
 
-  /*
-  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
-  FadeToFront();
-  */
-
-  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-	    DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
-	    DXSIZE,DYSIZE,
-	    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
-  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-	    DOOR_GFX_PAGEX6+ED_BUTTON_ELEM_XPOS,
-	    DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS,
-	    4*ED_BUTTON_ELEM_XSIZE,5*ED_BUTTON_ELEM_YSIZE,
-	    DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS,
-	    DOOR_GFX_PAGEY1+ED_BUTTON_EUP_Y2POS);
-
-  for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
-  {
-    if (i < elements_in_list)
-      graphic = el2gfx(editor_element[i + element_shift]);
-    else
-      graphic = GFX_LEERRAUM;
-
-    DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-		       DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS+3 + 
-		       (i%MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
-		       DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS+3 +
-		       (i/MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
-		       graphic);
-  }
+  /* copy default editor door content to main double buffer */
+  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+	    DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-		     DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
-		     DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
+  /* draw mouse button brush elements */
+  DrawMiniGraphicExt(drawto, gc,
+		     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
 		     el2gfx(new_element1));
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-		     DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
-		     DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
+  DrawMiniGraphicExt(drawto, gc,
+		     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
 		     el2gfx(new_element2));
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-		     DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
-		     DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
+  DrawMiniGraphicExt(drawto, gc,
+		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
 		     el2gfx(new_element3));
-  DrawTextExt(pix[PIX_DB_DOOR],gc,
-	      DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS,
-	      DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
-	      int2str(level_nr,2),FS_SMALL,FC_SPECIAL1);
-  XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-	    DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+3,
-	    DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
-	    7,FONT3_YSIZE,
-	    DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS,
-	    DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
-  XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-	    DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+14,
-	    DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
-	    7,FONT3_YSIZE,
-	    DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS+9,
-	    DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
-
-  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-	    DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY2,
-	    VXSIZE,VYSIZE,
-	    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
+
+  /* draw level number */
+  DrawTextExt(pix[PIX_DB_DOOR], gc,
+	      DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS,
+	      DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+	      int2str(level_nr, 2), FS_SMALL, FC_SPECIAL1);
+  /* copy level number to fit into level number field */
+  XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc,
+	    DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS + 3,
+	    DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+	    7, FONT3_YSIZE,
+	    DX + ED_WIN_LEVELNR_XPOS,
+	    DY + ED_WIN_LEVELNR_YPOS);
+  XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc,
+	    DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS + 14,
+	    DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+	    7, FONT3_YSIZE,
+	    DX + ED_WIN_LEVELNR_XPOS + 9,
+	    DY + ED_WIN_LEVELNR_YPOS);
 
   /* draw bigger door */
   XCopyArea(display, pix[PIX_DOOR], drawto, gc,
@@ -1857,19 +1845,17 @@ void DrawLevelEd()
 
   redraw_mask |= REDRAW_ALL;
 
-  OpenDoor(DOOR_OPEN_1);
-
-  strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name);
-
   MapControlButtons();
 
-  /*
-  MapMainDrawingArea();
-  */
+  /* copy actual editor door content to door double buffer for OpenDoor() */
+  XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
+	    DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
   DrawDrawingWindow();
   FadeToFront();
 
+  OpenDoor(DOOR_OPEN_1);
+
   /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
   */
@@ -1989,7 +1975,7 @@ static void ModifyEditorTextInput(int textinput_id, char *new_text)
 
 static void ModifyEditorCounter(int counter_id, int new_value)
 {
-  int *counter_value = *counterbutton_info[counter_id].counter_value;
+  int *counter_value = counterbutton_info[counter_id].value;
   int gadget_id = counterbutton_info[counter_id].gadget_id_text;
   struct GadgetInfo *gi = level_editor_gadget[gadget_id];
 
@@ -2093,13 +2079,6 @@ static void DrawLevelInfoWindow()
   DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
 	   "Editor Settings", FS_BIG, FC_YELLOW);
 
-  gadget_level_xsize_value = &lev_fieldx;
-  gadget_level_ysize_value = &lev_fieldy;
-  gadget_level_random_value = &random_placement_value;
-  gadget_level_collect_value = &level.edelsteine;
-  gadget_level_timelimit_value = &level.time;
-  gadget_level_timescore_value = &level.score[10];
-
   /* draw counter gadgets */
   for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++)
   {
@@ -2123,7 +2102,7 @@ static void DrawLevelInfoWindow()
       DrawTextF(x, y, font_color, infotext);
     }
 
-    ModifyEditorCounter(i, **counterbutton_info[i].counter_value);
+    ModifyEditorCounter(i, *counterbutton_info[i].value);
     MapCounterButtons(i);
   }
 
@@ -2181,7 +2160,7 @@ static void DrawAmoebaContentArea()
   int font_color = FC_GREEN;
   int x, y;
 
-  ElementContent[0][0][0] = level.amoebe_inhalt;
+  ElementContent[0][0][0] = level.amoeba_content;
 
   /* draw decorative border for the object */
   for (y=0; y<2; y++)
@@ -2207,7 +2186,7 @@ static void DrawAmoebaContentArea()
 
 static void DrawElementContentAreas()
 {
-  int *num_areas = &MampferMax;
+  int counter_id = ED_COUNTER_ID_ELEM_CONTENT;
   int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
   int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
@@ -2217,22 +2196,21 @@ static void DrawElementContentAreas()
   int font_color = FC_GREEN;
   int i, x, y;
 
-  for (i=0; i<MAX_ELEM_CONTENT; i++)
+  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
     for (y=0; y<3; y++)
       for (x=0; x<3; x++)
-	ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
+	ElementContent[i][x][y] = level.yam_content[i][x][y];
 
-  for (i=0; i<MAX_ELEM_CONTENT; i++)
+  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
     UnmapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
 
   /* display counter to choose number of element content areas */
-  gadget_elem_content_value = num_areas;
-
-  x = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].x + xoffset_right;
-  y = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].y + yoffset_right;
+  x = counterbutton_info[counter_id].x + xoffset_right;
+  y = counterbutton_info[counter_id].y + yoffset_right;
   DrawTextF(x, y, font_color, "number of content areas");
-  ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, *gadget_elem_content_value);
-  MapCounterButtons(ED_COUNTER_ID_ELEM_CONTENT);
+
+  ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+  MapCounterButtons(counter_id);
 
   /* delete content areas in case of reducing number of them */
   XFillRectangle(display, backbuffer, gc,
@@ -2240,7 +2218,7 @@ static void DrawElementContentAreas()
 		 SXSIZE, 12 * MINI_TILEY);
 
   /* draw some decorative border for the objects */
-  for (i=0; i<*num_areas; i++)
+  for (i=0; i<level.num_yam_contents; i++)
   {
     for (y=0; y<4; y++)
       for (x=0; x<4; x++)
@@ -2265,7 +2243,7 @@ static void DrawElementContentAreas()
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
 	   "smashed", FS_SMALL, font_color);
 
-  for (i=0; i<*num_areas; i++)
+  for (i=0; i<level.num_yam_contents; i++)
   {
     for (y=0; y<3; y++)
       for (x=0; x<3; x++)
@@ -2277,7 +2255,7 @@ static void DrawElementContentAreas()
 	      font_color, "%d", i + 1);
   }
 
-  for (i=0; i<*num_areas; i++)
+  for (i=0; i<level.num_yam_contents; i++)
     MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
 }
 
@@ -2289,6 +2267,7 @@ static void DrawElementContentAreas()
 
 static void DrawPropertiesWindow()
 {
+  int counter_id = ED_COUNTER_ID_ELEM_SCORE;
   int num_elements_in_level;
   float percentage;
   int xoffset_right = counter_xsize;
@@ -2302,55 +2281,55 @@ static void DrawPropertiesWindow()
   static struct
   {
     int element;
-    int *counter_value;
+    int *value;
     char *text;
   } elements_with_counter[] =
   {
-    { EL_EDELSTEIN,	&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_BD,	&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_GELB,&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_ROT,	&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_LILA,&level.score[0],	TEXT_COLLECTING },
-    { EL_DIAMANT,	&level.score[1],	TEXT_COLLECTING },
-    { EL_KAEFER_R,	&level.score[2],	TEXT_SMASHING },
-    { EL_KAEFER_O,	&level.score[2],	TEXT_SMASHING },
-    { EL_KAEFER_L,	&level.score[2],	TEXT_SMASHING },
-    { EL_KAEFER_U,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_R,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_O,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_L,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_U,	&level.score[2],	TEXT_SMASHING },
-    { EL_FLIEGER_R,	&level.score[3],	TEXT_SMASHING },
-    { EL_FLIEGER_O,	&level.score[3],	TEXT_SMASHING },
-    { EL_FLIEGER_L,	&level.score[3],	TEXT_SMASHING },
-    { EL_FLIEGER_U,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_R,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_O,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_L,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_U,	&level.score[3],	TEXT_SMASHING },
-    { EL_MAMPFER,	&level.score[4],	TEXT_SMASHING },
-    { EL_MAMPFER2,	&level.score[4],	TEXT_SMASHING },
-    { EL_ROBOT,		&level.score[5],	TEXT_SMASHING },
-    { EL_PACMAN_R,	&level.score[6],	TEXT_SMASHING },
-    { EL_PACMAN_O,	&level.score[6],	TEXT_SMASHING },
-    { EL_PACMAN_L,	&level.score[6],	TEXT_SMASHING },
-    { EL_PACMAN_U,	&level.score[6],	TEXT_SMASHING },
-    { EL_KOKOSNUSS,	&level.score[7],	TEXT_CRACKING },
-    { EL_DYNAMIT_AUS,	&level.score[8],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL1,	&level.score[9],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL2,	&level.score[9],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL3,	&level.score[9],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL4,	&level.score[9],	TEXT_COLLECTING },
-    { EL_EM_KEY_1_FILE,	&level.score[9],	TEXT_COLLECTING },
-    { EL_EM_KEY_2_FILE,	&level.score[9],	TEXT_COLLECTING },
-    { EL_EM_KEY_3_FILE,	&level.score[9],	TEXT_COLLECTING },
-    { EL_EM_KEY_4_FILE,	&level.score[9],	TEXT_COLLECTING },
-    { EL_AMOEBE_NASS,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_AMOEBE_NORM,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_AMOEBE_VOLL,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_AMOEBE_BD,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_SIEB_INAKTIV,	&level.dauer_sieb,	TEXT_DURATION },
-    { EL_ABLENK_AUS,	&level.dauer_ablenk,	TEXT_DURATION },
+    { EL_EDELSTEIN,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_BD,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_GELB,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_ROT,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EDELSTEIN_LILA,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_DIAMANT,	&level.score[SC_DIAMANT],	TEXT_COLLECTING },
+    { EL_KAEFER_R,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_KAEFER_O,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_KAEFER_L,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_KAEFER_U,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_R,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_O,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_L,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_U,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_FLIEGER_R,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FLIEGER_O,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FLIEGER_L,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FLIEGER_U,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_R,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_O,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_L,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_U,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_MAMPFER,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
+    { EL_MAMPFER2,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
+    { EL_ROBOT,		&level.score[SC_ROBOT],		TEXT_SMASHING },
+    { EL_PACMAN_R,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_O,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_L,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_U,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_KOKOSNUSS,	&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
+    { EL_DYNAMIT_AUS,	&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL1,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL2,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL3,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_SCHLUESSEL4,	&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_AMOEBE_NASS,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_AMOEBE_NORM,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_AMOEBE_VOLL,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_AMOEBE_BD,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_SIEB_INAKTIV,	&level.time_magic_wall,		TEXT_DURATION },
+    { EL_ABLENK_AUS,	&level.time_wheel,		TEXT_DURATION },
     { -1, NULL, NULL }
   };
 
@@ -2407,22 +2386,20 @@ static void DrawPropertiesWindow()
   {
     if (elements_with_counter[i].element == properties_element)
     {
-      int x = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].x + xoffset_right;
-      int y = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].y + yoffset_right;
-
-      gadget_elem_score_value = elements_with_counter[i].counter_value;
+      int x = counterbutton_info[counter_id].x + xoffset_right;
+      int y = counterbutton_info[counter_id].y + yoffset_right;
 
+      counterbutton_info[counter_id].value = elements_with_counter[i].value;
       DrawTextF(x, y, font_color, elements_with_counter[i].text);
-      ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, *gadget_elem_score_value);
-      MapCounterButtons(ED_COUNTER_ID_ELEM_SCORE);
+
+      ModifyEditorCounter(counter_id,  *counterbutton_info[counter_id].value);
+      MapCounterButtons(counter_id);
       break;
     }
   }
 
   if (HAS_CONTENT(properties_element))
   {
-
-#if 1
     /* draw stickybutton gadget */
     i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
     x = checkbutton_info[i].x + xoffset_right2;
@@ -2432,8 +2409,6 @@ static void DrawPropertiesWindow()
     ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
 		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
     MapCheckbuttonGadget(i);
-#endif
-
 
     if (IS_AMOEBOID(properties_element))
       DrawAmoebaContentArea();
@@ -2678,16 +2653,12 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
   static int brush_width, brush_height;
   static int last_cursor_x = -1, last_cursor_y = -1;
   static boolean delete_old_brush;
-  int new_element;
+  int new_element = BUTTON_ELEMENT(button);
   int x, y;
 
   if (mode == CB_DELETE_OLD_CURSOR && !delete_old_brush)
     return;
 
-  new_element = (button == 1 ? new_element1 :
-		 button == 2 ? new_element2 :
-		 button == 3 ? new_element3 : 0);
-
   if (mode == CB_AREA_TO_BRUSH)
   {
     int from_lx, from_ly;
@@ -2769,19 +2740,9 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
       }
     }
 
-    /*
-    printf("%d, %d - %d, %d in level and screen\n",
-	   border_from_x, border_from_y, border_to_x, border_to_y);
-    */
-
     if (mode != CB_DELETE_OLD_CURSOR)
       DrawAreaBorder(border_from_x, border_from_y, border_to_x, border_to_y);
 
-    /*
-    if (mode == CB_BRUSH_TO_LEVEL)
-      CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
-    */
-
     last_cursor_x = cursor_x;
     last_cursor_y = cursor_y;
     delete_old_brush = TRUE;
@@ -3110,11 +3071,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   /* handle info callback for each invocation of action callback */
   gi->callback_info(gi);
 
-  /*
-  if (edit_mode != ED_MODE_DRAWING)
-    return;
-  */
-
   button_press_event = (gi->event.type == GD_EVENT_PRESSED);
   button_release_event = (gi->event.type == GD_EVENT_RELEASED);
 
@@ -3149,17 +3105,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   if (!button && !button_release_event)
     return;
 
-
-#if 0
-  if (button_release_event)
-    button = 0;
-#endif
-
-#if 0
-  if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS)
-    return;
-#endif
-
   /* automatically switch to 'single item' drawing mode, if needed */
   actual_drawing_function =
     (draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS);
@@ -3223,12 +3168,12 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 			   el2gfx(new_element));
 
 	if (id == GADGET_ID_AMOEBA_CONTENT)
-	  level.amoebe_inhalt = new_element;
+	  level.amoeba_content = new_element;
 	else if (id == GADGET_ID_RANDOM_BACKGROUND)
 	  random_placement_background_element = new_element;
 	else if (id >= GADGET_ID_ELEM_CONTENT_0 &&
 		 id <= GADGET_ID_ELEM_CONTENT_7)
-	  level.mampfer_inhalt[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
+	  level.yam_content[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
 	    new_element;
       }
       break;
@@ -3322,12 +3267,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_PICK_ELEMENT:
-
-      /*
-      if (button_press_event)
-	PickDrawingElement(button, Feld[lx][ly]);
-      */
-
       if (button_release_event)
 	ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT);
       else
@@ -3342,127 +3281,47 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 
 static void HandleCounterButtons(struct GadgetInfo *gi)
 {
-  int id = gi->custom_id;
+  int gadget_id = gi->custom_id;
+  int counter_id = gi->custom_type_id;
   int button = gi->event.button;
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-
-  switch (id)
-  {
-    case GADGET_ID_ELEM_SCORE_DOWN:
-    case GADGET_ID_ELEM_SCORE_UP:
-      step *= (id == GADGET_ID_ELEM_SCORE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE,
-			  *gadget_elem_score_value + step);
-      break;
-    case GADGET_ID_ELEM_SCORE_TEXT:
-      *gadget_elem_score_value = gi->text.number_value;
-      break;
-
-    case GADGET_ID_ELEM_CONTENT_DOWN:
-    case GADGET_ID_ELEM_CONTENT_UP:
-      step *= (id == GADGET_ID_ELEM_CONTENT_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT,
-			  *gadget_elem_content_value + step);
-      DrawElementContentAreas();
-      break;
-    case GADGET_ID_ELEM_CONTENT_TEXT:
-      *gadget_elem_content_value = gi->text.number_value;
-      DrawElementContentAreas();
-      break;
-
-    case GADGET_ID_LEVEL_XSIZE_DOWN:
-    case GADGET_ID_LEVEL_XSIZE_UP:
-      step *= (id == GADGET_ID_LEVEL_XSIZE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_XSIZE,
-			  *gadget_level_xsize_value + step);
-      level.fieldx = lev_fieldx;
-      break;
-    case GADGET_ID_LEVEL_XSIZE_TEXT:
-      *gadget_level_xsize_value = gi->text.number_value;
-      level.fieldx = lev_fieldx;
-      break;
-
-    case GADGET_ID_LEVEL_YSIZE_DOWN:
-    case GADGET_ID_LEVEL_YSIZE_UP:
-      step *= (id == GADGET_ID_LEVEL_YSIZE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_YSIZE,
-			  *gadget_level_ysize_value + step);
-      level.fieldy = lev_fieldy;
-      break;
-    case GADGET_ID_LEVEL_YSIZE_TEXT:
-      *gadget_level_ysize_value = gi->text.number_value;
-      level.fieldy = lev_fieldy;
-      break;
-
-    case GADGET_ID_LEVEL_RANDOM_DOWN:
-    case GADGET_ID_LEVEL_RANDOM_UP:
-      step *= (id == GADGET_ID_LEVEL_RANDOM_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_RANDOM,
-			  *gadget_level_random_value + step);
-      break;
-    case GADGET_ID_LEVEL_RANDOM_TEXT:
-      *gadget_level_random_value = gi->text.number_value;
-      break;
-
-    case GADGET_ID_LEVEL_COLLECT_DOWN:
-    case GADGET_ID_LEVEL_COLLECT_UP:
-      step *= (id == GADGET_ID_LEVEL_COLLECT_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_COLLECT,
-			  *gadget_level_collect_value + step);
-      break;
-    case GADGET_ID_LEVEL_COLLECT_TEXT:
-      *gadget_level_collect_value = gi->text.number_value;
-      break;
-
-    case GADGET_ID_LEVEL_TIMELIMIT_DOWN:
-    case GADGET_ID_LEVEL_TIMELIMIT_UP:
-      step *= (id == GADGET_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMELIMIT,
-			  *gadget_level_timelimit_value + step);
-      break;
-    case GADGET_ID_LEVEL_TIMELIMIT_TEXT:
-      *gadget_level_timelimit_value = gi->text.number_value;
-      break;
+  int *counter_value = counterbutton_info[counter_id].value;
+  int step = BUTTON_STEPSIZE(button) *
+    (gadget_id == counterbutton_info[counter_id].gadget_id_down ? -1 : +1);
 
-    case GADGET_ID_LEVEL_TIMESCORE_DOWN:
-    case GADGET_ID_LEVEL_TIMESCORE_UP:
-      step *= (id == GADGET_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMESCORE,
-			  *gadget_level_timescore_value + step);
-      break;
-    case GADGET_ID_LEVEL_TIMESCORE_TEXT:
-      *gadget_level_timescore_value = gi->text.number_value;
-      break;
-
-    default:
-      break;
-  }
+  if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+    *counter_value = gi->text.number_value;
+  else
+    ModifyEditorCounter(counter_id, *counter_value + step);
+
+  if (counter_id == ED_COUNTER_ID_ELEM_CONTENT)
+    DrawElementContentAreas();
+  else if (counter_id == ED_COUNTER_ID_LEVEL_XSIZE)
+    lev_fieldx = level.fieldx;
+  else if (counter_id == ED_COUNTER_ID_LEVEL_YSIZE)
+    lev_fieldy = level.fieldy;
 }
 
 static void HandleTextInputGadgets(struct GadgetInfo *gi)
 {
-  int id = gi->custom_id;
-
-  switch (id)
-  {
-    case GADGET_ID_LEVEL_NAME:
-      strcpy(level.name, gi->text.value);
-      break;
+  strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
+}
 
-    case GADGET_ID_LEVEL_AUTHOR:
-      strcpy(level.author, gi->text.value);
-      break;
+static void HandleRadiobuttons(struct GadgetInfo *gi)
+{
+  *radiobutton_info[gi->custom_type_id].value =
+    radiobutton_info[gi->custom_type_id].checked_value;
+}
 
-    default:
-      break;
-  }
+static void HandleCheckbuttons(struct GadgetInfo *gi)
+{
+  *checkbutton_info[gi->custom_type_id].value ^= TRUE;
 }
 
 static void HandleControlButtons(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
   int button = gi->event.button;
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int step = BUTTON_STEPSIZE(button);
   int new_element = BUTTON_ELEMENT(button);
   int player_present = FALSE;
   int level_changed = FALSE;
@@ -3698,12 +3557,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	  if (Feld[x][y] != Ur[x][y])
 	    level_changed = TRUE;
 
-      if (0 && !level_changed)
-      {
-	Request("Level has not changed !", REQ_CONFIRM);
-	break;
-      }
-
       for(y=0; y<lev_fieldy; y++) 
 	for(x=0; x<lev_fieldx; x++)
 	  if (Feld[x][y] == EL_SPIELFIGUR ||
@@ -3804,32 +3657,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       break;
 
-    case GADGET_ID_RANDOM_PERCENTAGE:
-      *radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].value =
-	radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].checked_value;
-      break;
-
-    case GADGET_ID_RANDOM_QUANTITY:
-      *radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].value =
-	radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].checked_value;
-      break;
-
-    case GADGET_ID_RANDOM_RESTRICTED:
-      *checkbutton_info[ED_CHECKBUTTON_ID_RANDOM_RESTRICTED].value ^= TRUE;
-      break;
-
-    case GADGET_ID_DOUBLE_SPEED:
-      *checkbutton_info[ED_CHECKBUTTON_ID_DOUBLE_SPEED].value ^= TRUE;
-      break;
-
-    case GADGET_ID_GRAVITY:
-      *checkbutton_info[ED_CHECKBUTTON_ID_GRAVITY].value ^= TRUE;
-      break;
-
-    case GADGET_ID_STICK_ELEMENT:
-      *checkbutton_info[ED_CHECKBUTTON_ID_STICK_ELEMENT].value ^= TRUE;
-      break;
-
     default:
       if (id >= GADGET_ID_ELEMENTLIST_FIRST &&
 	  id <= GADGET_ID_ELEMENTLIST_LAST)