X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=ed78feab149af7f69bbd7efbb7416d79d9ff8514;hb=7119b5d2e756b1ab23818ea39d19aece0563bab0;hp=17b2c66384a6e66aab0780c69bcccf183a69f026;hpb=79411a5006963926966da0465fd46344a34a57fe;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 17b2c663..ed78feab 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -263,39 +263,40 @@
 #define GADGET_ID_ELEM_CONTENT_6	56
 #define GADGET_ID_ELEM_CONTENT_7	57
 #define GADGET_ID_AMOEBA_CONTENT	58
+#define GADGET_ID_RANDOM_BACKGROUND	59
 
 /* text input identifiers */
-#define GADGET_ID_LEVEL_NAME		59
-#define GADGET_ID_LEVEL_AUTHOR		60
+#define GADGET_ID_LEVEL_NAME		60
+#define GADGET_ID_LEVEL_AUTHOR		61
 
 /* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLL_UP		61
-#define GADGET_ID_SCROLL_DOWN		62
-#define GADGET_ID_SCROLL_LEFT		63
-#define GADGET_ID_SCROLL_RIGHT		64
-#define GADGET_ID_SCROLL_HORIZONTAL	65
-#define GADGET_ID_SCROLL_VERTICAL	66
+#define GADGET_ID_SCROLL_UP		62
+#define GADGET_ID_SCROLL_DOWN		63
+#define GADGET_ID_SCROLL_LEFT		64
+#define GADGET_ID_SCROLL_RIGHT		65
+#define GADGET_ID_SCROLL_HORIZONTAL	66
+#define GADGET_ID_SCROLL_VERTICAL	67
 
 /* gadgets for scrolling element list */
-#define GADGET_ID_SCROLL_LIST_UP	67
-#define GADGET_ID_SCROLL_LIST_DOWN	68
-#define GADGET_ID_SCROLL_LIST_VERTICAL	69
-
-/* buttons for level settings */
-#define GADGET_ID_RANDOM_PERCENTAGE	70
-#define GADGET_ID_RANDOM_QUANTITY	71
-#define GADGET_ID_RANDOM_RESTRICTED	72
-#define GADGET_ID_DOUBLE_SPEED		73
-#define GADGET_ID_GRAVITY		74
-#define GADGET_ID_STICK_ELEMENT		75
-#define GADGET_ID_EM_SLIPPERY_GEMS	76
-
-/* another drawing area for random placement */
-#define GADGET_ID_RANDOM_BACKGROUND	77
+#define GADGET_ID_SCROLL_LIST_UP	68
+#define GADGET_ID_SCROLL_LIST_DOWN	69
+#define GADGET_ID_SCROLL_LIST_VERTICAL	70
+
+/* buttons for level/element properties */
+#define GADGET_ID_RANDOM_PERCENTAGE	71
+#define GADGET_ID_RANDOM_QUANTITY	72
+#define GADGET_ID_RANDOM_RESTRICTED	73
+#define GADGET_ID_DOUBLE_SPEED		74
+#define GADGET_ID_GRAVITY		75
+#define GADGET_ID_STICK_ELEMENT		76
+#define GADGET_ID_EM_SLIPPERY_GEMS	77
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE	78
+#define GADGET_ID_CUSTOM_CAN_FALL	79
+#define GADGET_ID_CUSTOM_SLIPPERY	80
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST	78
-#define GADGET_ID_ELEMENTLIST_LAST	(78 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
+#define GADGET_ID_ELEMENTLIST_FIRST	81
+#define GADGET_ID_ELEMENTLIST_LAST	(81 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define NUM_EDITOR_GADGETS		(GADGET_ID_ELEMENTLIST_LAST + 1)
 
@@ -358,12 +359,18 @@
 #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_INDESTRUCTIBLE	5
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL	6
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY	7
 
-#define ED_NUM_CHECKBUTTONS			5
+#define ED_NUM_CHECKBUTTONS			8
 
 #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_INDESTRUCTIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_LAST	ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY
+
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE	0
 #define ED_RADIOBUTTON_ID_QUANTITY	1
@@ -420,10 +427,17 @@ static struct
 
 static int random_placement_value = 10;
 static int random_placement_method = RANDOM_USE_QUANTITY;
-static int random_placement_background_element = EL_ERDREICH;
+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 slippery;
+} custom_element_properties[NUM_CUSTOM_ELEMENTS];
+
 static struct
 {
   int x, y;
@@ -678,6 +692,24 @@ static struct
     GADGET_ID_EM_SLIPPERY_GEMS,
     &level.em_slippery_gems,
     "slip down from certain flat walls","use EM style slipping behaviour"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(4),
+    GADGET_ID_CUSTOM_INDESTRUCTIBLE,
+    &custom_element_properties[0].indestructible,
+    "indestructible",			"element cannot be destroyed"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(5),
+    GADGET_ID_CUSTOM_CAN_FALL,
+    &custom_element_properties[0].can_fall,
+    "can fall",				"element can fall down"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(6),
+    GADGET_ID_CUSTOM_SLIPPERY,
+    &custom_element_properties[0].slippery,
+    "slippery",				"other elements can fall down from it"
   }
 };
 
@@ -694,13 +726,13 @@ static int level_xpos = -1, level_ypos = -1;
 #define IN_ED_FIELD(x,y)  ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldy)
 
 /* drawing elements on the three mouse buttons */
-static int new_element1 = EL_MAUERWERK;
-static int new_element2 = EL_LEERRAUM;
-static int new_element3 = EL_ERDREICH;
+static int new_element1 = EL_WALL;
+static int new_element2 = EL_EMPTY;
+static int new_element3 = EL_SAND;
 
 #define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
 				(button) == 2 ? new_element2 : \
-				(button) == 3 ? new_element3 : EL_LEERRAUM)
+				(button) == 3 ? new_element3 : EL_EMPTY)
 #define BUTTON_STEPSIZE(button) ((button) == 1 ? 1 : (button) == 2 ? 5 : 10)
 
 /* forward declaration for internal use */
@@ -737,7 +769,7 @@ static int counter_xsize = DXSIZE + FONT2_XSIZE - 2 * ED_GADGET_DISTANCE;
 
 int element_shift = 0;
 
-int editor_element[] =
+int editor_el_boulderdash[] =
 {
   EL_CHAR('B'),
   EL_CHAR('O'),
@@ -754,31 +786,35 @@ int editor_element[] =
   EL_CHAR('S'),
   EL_CHAR('H'),
 
-  EL_SPIELFIGUR,
-  EL_LEERRAUM,
-  EL_ERDREICH,
-  EL_BETON,
+  EL_PLAYER1,
+  EL_EMPTY,
+  EL_SAND,
+  EL_STEELWALL,
 
   EL_BD_WALL,
-  EL_MAGIC_WALL_BD_OFF,
-  EL_AUSGANG_ZU,
-  EL_AUSGANG_AUF,
+  EL_BD_MAGIC_WALL,
+  EL_EXIT_CLOSED,
+  EL_EXIT_OPEN,
 
-  EL_EDELSTEIN_BD,
-  EL_BUTTERFLY_UP,
-  EL_FIREFLY_UP,
+  EL_BD_DIAMOND,
+  EL_BD_BUTTERFLY_UP,
+  EL_BD_FIREFLY_UP,
   EL_BD_ROCK,
 
-  EL_BUTTERFLY_LEFT,
-  EL_FIREFLY_LEFT,
-  EL_BUTTERFLY_RIGHT,
-  EL_FIREFLY_RIGHT,
+  EL_BD_BUTTERFLY_LEFT,
+  EL_BD_FIREFLY_LEFT,
+  EL_BD_BUTTERFLY_RIGHT,
+  EL_BD_FIREFLY_RIGHT,
 
-  EL_AMOEBE_BD,
-  EL_BUTTERFLY_DOWN,
-  EL_FIREFLY_DOWN,
-  EL_LEERRAUM,
+  EL_BD_AMOEBA,
+  EL_BD_BUTTERFLY_DOWN,
+  EL_BD_FIREFLY_DOWN,
+  EL_EMPTY,
+};
+int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash);
 
+int editor_el_emerald_mine[] =
+{
   EL_CHAR('E'),
   EL_CHAR('M'),
   EL_CHAR('E'),
@@ -794,182 +830,189 @@ int editor_element[] =
   EL_CHAR('N'),
   EL_CHAR('E'),
 
-  EL_SPIELER1,
-  EL_SPIELER2,
-  EL_SPIELER3,
-  EL_SPIELER4,
+  EL_PLAYER1,
+  EL_PLAYER2,
+  EL_PLAYER3,
+  EL_PLAYER4,
 
-  EL_SPIELFIGUR,
-  EL_LEERRAUM,
-  EL_ERDREICH,
-  EL_FELSBROCKEN,
+  EL_PLAYER1,
+  EL_EMPTY,
+  EL_SAND,
+  EL_ROCK,
 
-  EL_BETON,
-  EL_MAUERWERK,
-  EL_FELSBODEN,
-  EL_MAGIC_WALL_OFF,
+  EL_STEELWALL,
+  EL_WALL,
+  EL_WALL_CRUMBLED,
+  EL_MAGIC_WALL,
 
-  EL_EDELSTEIN,
-  EL_DIAMANT,
-  EL_KOKOSNUSS,
-  EL_BOMBE,
+  EL_EMERALD,
+  EL_DIAMOND,
+  EL_NUT,
+  EL_BOMB,
 
-  EL_ERZ_EDEL,
-  EL_ERZ_DIAM,
-  EL_MORAST_LEER,
-  EL_MORAST_VOLL,
+  EL_WALL_EMERALD,
+  EL_WALL_DIAMOND,
+  EL_QUICKSAND_EMPTY,
+  EL_QUICKSAND_FULL,
 
-  EL_DYNAMITE_INACTIVE,
+  EL_DYNAMITE,
   EL_DYNAMITE_ACTIVE,
-  EL_AUSGANG_ZU,
-  EL_AUSGANG_AUF,
+  EL_EXIT_CLOSED,
+  EL_EXIT_OPEN,
 
-  EL_MAMPFER,
-  EL_KAEFER_UP,
-  EL_FLIEGER_UP,
+  EL_YAMYAM,
+  EL_BUG_UP,
+  EL_SPACESHIP_UP,
   EL_ROBOT,
 
-  EL_KAEFER_LEFT,
-  EL_FLIEGER_LEFT,
-  EL_KAEFER_RIGHT,
-  EL_FLIEGER_RIGHT,
-
-  EL_ABLENK_AUS,
-  EL_KAEFER_DOWN,
-  EL_FLIEGER_DOWN,
-  EL_UNSICHTBAR,
-
-  EL_BADEWANNE1,
-  EL_SALZSAEURE,
-  EL_BADEWANNE2,
-  EL_LEERRAUM,
-
-  EL_BADEWANNE3,
-  EL_BADEWANNE4,
-  EL_BADEWANNE5,
-  EL_LEERRAUM,
-
-  EL_TROPFEN,
-  EL_AMOEBE_TOT,
-  EL_AMOEBE_NASS,
-  EL_AMOEBE_NORM,
-
-  EL_EM_KEY_1_FILE,
-  EL_EM_KEY_2_FILE,
-  EL_EM_KEY_3_FILE,
-  EL_EM_KEY_4_FILE,
-
-  EL_EM_GATE_1,
-  EL_EM_GATE_2,
-  EL_EM_GATE_3,
-  EL_EM_GATE_4,
-
-  EL_EM_GATE_1X,
-  EL_EM_GATE_2X,
-  EL_EM_GATE_3X,
-  EL_EM_GATE_4X,
+  EL_BUG_LEFT,
+  EL_SPACESHIP_LEFT,
+  EL_BUG_RIGHT,
+  EL_SPACESHIP_RIGHT,
+
+  EL_ROBOT_WHEEL,
+  EL_BUG_DOWN,
+  EL_SPACESHIP_DOWN,
+  EL_INVISIBLE_WALL,
+
+  EL_ACIDPOOL_TOPLEFT,
+  EL_ACID,
+  EL_ACIDPOOL_TOPRIGHT,
+  EL_EMPTY,
+
+  EL_ACIDPOOL_BOTTOMLEFT,
+  EL_ACIDPOOL_BOTTOM,
+  EL_ACIDPOOL_BOTTOMRIGHT,
+  EL_EMPTY,
+
+  EL_AMOEBA_DROP,
+  EL_AMOEBA_DEAD,
+  EL_AMOEBA_WET,
+  EL_AMOEBA_DRY,
+
+  EL_EM_KEY1_FILE,
+  EL_EM_KEY2_FILE,
+  EL_EM_KEY3_FILE,
+  EL_EM_KEY4_FILE,
+
+  EL_EM_GATE1,
+  EL_EM_GATE2,
+  EL_EM_GATE3,
+  EL_EM_GATE4,
+
+  EL_EM_GATE1_GRAY,
+  EL_EM_GATE2_GRAY,
+  EL_EM_GATE3_GRAY,
+  EL_EM_GATE4_GRAY,
+};
+int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
 
+int editor_el_more[] =
+{
   EL_CHAR('M'),
   EL_CHAR('O'),
   EL_CHAR('R'),
   EL_CHAR('E'),
 
-  EL_SCHLUESSEL1,
-  EL_SCHLUESSEL2,
-  EL_SCHLUESSEL3,
-  EL_SCHLUESSEL4,
-
-  EL_PFORTE1,
-  EL_PFORTE2,
-  EL_PFORTE3,
-  EL_PFORTE4,
-
-  EL_PFORTE1X,
-  EL_PFORTE2X,
-  EL_PFORTE3X,
-  EL_PFORTE4X,
-
-  EL_PFEIL_LEFT,
-  EL_PFEIL_RIGHT,
-  EL_PFEIL_UP,
-  EL_PFEIL_DOWN,
-
-  EL_AMOEBE_VOLL,
-  EL_EDELSTEIN_GELB,
-  EL_EDELSTEIN_ROT,
-  EL_EDELSTEIN_LILA,
-
-  EL_ERZ_EDEL_BD,
-  EL_ERZ_EDEL_GELB,
-  EL_ERZ_EDEL_ROT,
-  EL_ERZ_EDEL_LILA,
-
-  EL_LIFE,
+  EL_KEY1,
+  EL_KEY2,
+  EL_KEY3,
+  EL_KEY4,
+
+  EL_GATE1,
+  EL_GATE2,
+  EL_GATE3,
+  EL_GATE4,
+
+  EL_GATE1_GRAY,
+  EL_GATE2_GRAY,
+  EL_GATE3_GRAY,
+  EL_GATE4_GRAY,
+
+  EL_ARROW_BLUE_LEFT,
+  EL_ARROW_BLUE_RIGHT,
+  EL_ARROW_BLUE_UP,
+  EL_ARROW_BLUE_DOWN,
+
+  EL_AMOEBA_FULL,
+  EL_EMERALD_YELLOW,
+  EL_EMERALD_RED,
+  EL_EMERALD_PURPLE,
+
+  EL_WALL_BD_DIAMOND,
+  EL_WALL_EMERALD_YELLOW,
+  EL_WALL_EMERALD_RED,
+  EL_WALL_EMERALD_PURPLE,
+
+  EL_GAMEOFLIFE,
   EL_PACMAN_UP,
-  EL_ZEIT_VOLL,
-  EL_ZEIT_LEER,
+  EL_TIME_ORB_FULL,
+  EL_TIME_ORB_EMPTY,
 
   EL_PACMAN_LEFT,
-  EL_MAMPFER2,
+  EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_MAUER_LEBT,
+  EL_WALL_GROWING,
 
-  EL_LIFE_ASYNC,
+  EL_BIOMAZE,
   EL_PACMAN_DOWN,
-  EL_BIRNE_AUS,
-  EL_BIRNE_EIN,
+  EL_LAMP,
+  EL_LAMP_ACTIVE,
 
   EL_DYNABOMB_NR,
   EL_DYNABOMB_SZ,
   EL_DYNABOMB_XL,
-  EL_BADEWANNE,
+  EL_STONEBLOCK,
 
   EL_MOLE,
-  EL_PINGUIN,
-  EL_SCHWEIN,
-  EL_DRACHE,
+  EL_PENGUIN,
+  EL_PIG,
+  EL_DRAGON,
 
-  EL_LEERRAUM,
+  EL_EMPTY,
   EL_MOLE_UP,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
+  EL_EMPTY,
+  EL_EMPTY,
 
   EL_MOLE_LEFT,
-  EL_LEERRAUM,
+  EL_EMPTY,
   EL_MOLE_RIGHT,
-  EL_LEERRAUM,
+  EL_EMPTY,
 
-  EL_LEERRAUM,
+  EL_EMPTY,
   EL_MOLE_DOWN,
   EL_BALLOON,
-  EL_BALLOON_SEND_ANY,
+  EL_BALLOON_SEND_ANY_DIRECTION,
 
   EL_BALLOON_SEND_LEFT,
   EL_BALLOON_SEND_RIGHT,
   EL_BALLOON_SEND_UP,
   EL_BALLOON_SEND_DOWN,
 
-  EL_SONDE,
-  EL_MAUER_X,
-  EL_MAUER_Y,
-  EL_MAUER_XY,
+  EL_SATELLITE,
+  EL_WALL_GROWING_X,
+  EL_WALL_GROWING_Y,
+  EL_WALL_GROWING_XY,
 
-  EL_INVISIBLE_STEEL,
-  EL_UNSICHTBAR,
+  EL_INVISIBLE_STEELWALL,
+  EL_INVISIBLE_WALL,
   EL_SPEED_PILL,
   EL_BLACK_ORB,
 
-  EL_EMC_STEEL_WALL_1,
-  EL_EMC_WALL_1,
-  EL_EMC_WALL_2,
-  EL_EMC_WALL_3,
-
-  EL_EMC_WALL_4,
-  EL_EMC_WALL_5,
-  EL_EMC_WALL_6,
-  EL_EMC_WALL_7,
+  EL_EMC_STEELWALL1,
+  EL_EMC_WALL_PILLAR_UPPER,
+  EL_EMC_WALL_PILLAR_MIDDLE,
+  EL_EMC_WALL_PILLAR_LOWER,
 
+  EL_EMC_WALL4,
+  EL_EMC_WALL5,
+  EL_EMC_WALL6,
+  EL_EMC_WALL7,
+};
+int num_editor_el_more = SIZEOF_ARRAY_INT(editor_el_more);
 
+int editor_el_sokoban[] =
+{
   EL_CHAR('S'),
   EL_CHAR('O'),
   EL_CHAR('K'),
@@ -980,11 +1023,15 @@ int editor_element[] =
   EL_CHAR('A'),
   EL_CHAR('N'),
 
-  EL_SOKOBAN_OBJEKT,
-  EL_SOKOBAN_FELD_LEER,
-  EL_SOKOBAN_FELD_VOLL,
-  EL_BETON,
+  EL_SOKOBAN_OBJECT,
+  EL_SOKOBAN_FIELD_EMPTY,
+  EL_SOKOBAN_FIELD_FULL,
+  EL_STEELWALL,
+};
+int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban);
 
+int editor_el_supaplex[] =
+{
   EL_CHAR('S'),
   EL_CHAR('U'),
   EL_CHAR('P'),
@@ -1003,7 +1050,7 @@ int editor_element[] =
   EL_SP_INFOTRON,
   EL_SP_CHIP_SINGLE,
   EL_SP_HARD_GRAY,
-  EL_SP_EXIT,
+  EL_SP_EXIT_CLOSED,
 
   EL_SP_DISK_ORANGE,
   EL_SP_PORT1_RIGHT,
@@ -1026,7 +1073,7 @@ int editor_element[] =
   EL_SP_PORT_XY,
 
   EL_SP_ELECTRON,
-  EL_SP_BUG,
+  EL_SP_BUGGY_BASE,
   EL_SP_CHIP_LEFT,
   EL_SP_CHIP_RIGHT,
 
@@ -1044,7 +1091,11 @@ int editor_element[] =
   EL_SP_HARD_BASE6,
   EL_SP_CHIP_UPPER,
   EL_SP_CHIP_LOWER,
+};
+int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
 
+int editor_el_diamond_caves[] =
+{
   EL_CHAR('D'),
   EL_CHAR('I'),
   EL_CHAR('A'),
@@ -1070,61 +1121,65 @@ int editor_element[] =
   EL_WALL_PEARL,
   EL_WALL_CRYSTAL,
 
-  EL_BELT1_LEFT,
-  EL_BELT1_MIDDLE,
-  EL_BELT1_RIGHT,
-  EL_BELT1_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT1_LEFT,
+  EL_CONVEYOR_BELT1_MIDDLE,
+  EL_CONVEYOR_BELT1_RIGHT,
+  EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
 
-  EL_BELT2_LEFT,
-  EL_BELT2_MIDDLE,
-  EL_BELT2_RIGHT,
-  EL_BELT2_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT2_LEFT,
+  EL_CONVEYOR_BELT2_MIDDLE,
+  EL_CONVEYOR_BELT2_RIGHT,
+  EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
 
-  EL_BELT3_LEFT,
-  EL_BELT3_MIDDLE,
-  EL_BELT3_RIGHT,
-  EL_BELT3_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT3_LEFT,
+  EL_CONVEYOR_BELT3_MIDDLE,
+  EL_CONVEYOR_BELT3_RIGHT,
+  EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
 
-  EL_BELT4_LEFT,
-  EL_BELT4_MIDDLE,
-  EL_BELT4_RIGHT,
-  EL_BELT4_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT4_LEFT,
+  EL_CONVEYOR_BELT4_MIDDLE,
+  EL_CONVEYOR_BELT4_RIGHT,
+  EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
 
-  EL_BELT1_SWITCH_LEFT,
-  EL_BELT2_SWITCH_LEFT,
-  EL_BELT3_SWITCH_LEFT,
-  EL_BELT4_SWITCH_LEFT,
+  EL_CONVEYOR_BELT1_SWITCH_LEFT,
+  EL_CONVEYOR_BELT2_SWITCH_LEFT,
+  EL_CONVEYOR_BELT3_SWITCH_LEFT,
+  EL_CONVEYOR_BELT4_SWITCH_LEFT,
 
-  EL_BELT1_SWITCH_RIGHT,
-  EL_BELT2_SWITCH_RIGHT,
-  EL_BELT3_SWITCH_RIGHT,
-  EL_BELT4_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT4_SWITCH_RIGHT,
 
   EL_SWITCHGATE_OPEN,
   EL_SWITCHGATE_CLOSED,
-  EL_SWITCHGATE_SWITCH_1,
+  EL_SWITCHGATE_SWITCH_UP,
   EL_ENVELOPE,
 
   EL_TIMEGATE_CLOSED,
   EL_TIMEGATE_OPEN,
-  EL_TIMEGATE_SWITCH_OFF,
-  EL_LEERRAUM,
+  EL_TIMEGATE_SWITCH,
+  EL_EMPTY,
 
   EL_LANDMINE,
-  EL_SAND_INVISIBLE,
-  EL_STEEL_SLANTED,
-  EL_LEERRAUM,
+  EL_INVISIBLE_SAND,
+  EL_STEELWALL_SLANTED,
+  EL_EMPTY,
 
   EL_SIGN_EXCLAMATION,
   EL_SIGN_STOP,
-  EL_LIGHT_SWITCH_OFF,
-  EL_LIGHT_SWITCH_ON,
+  EL_LIGHT_SWITCH,
+  EL_LIGHT_SWITCH_ACTIVE,
 
-  EL_SHIELD_PASSIVE,
-  EL_SHIELD_ACTIVE,
+  EL_SHIELD_NORMAL,
+  EL_SHIELD_DEADLY,
   EL_EXTRA_TIME,
-  EL_LEERRAUM,
+  EL_EMPTY,
+};
+int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves);
 
+int editor_el_dx_boulderdash[] =
+{
   EL_CHAR('D'),
   EL_CHAR('X'),
   EL_CHAR('-'),
@@ -1147,45 +1202,32 @@ int editor_element[] =
 
   EL_SPRING,
   EL_TUBE_RIGHT_DOWN,
-  EL_TUBE_HORIZ_DOWN,
+  EL_TUBE_HORIZONTAL_DOWN,
   EL_TUBE_LEFT_DOWN,
 
   EL_TUBE_HORIZONTAL,
-  EL_TUBE_VERT_RIGHT,
-  EL_TUBE_CROSS,
-  EL_TUBE_VERT_LEFT,
+  EL_TUBE_VERTICAL_RIGHT,
+  EL_TUBE_ALL,
+  EL_TUBE_VERTICAL_LEFT,
 
   EL_TUBE_VERTICAL,
   EL_TUBE_RIGHT_UP,
-  EL_TUBE_HORIZ_UP,
+  EL_TUBE_HORIZONTAL_UP,
   EL_TUBE_LEFT_UP,
 
-  EL_TRAP_INACTIVE,
+  EL_TRAP,
   EL_DX_SUPABOMB,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-
-  /*
-  EL_CHAR('D'),
-  EL_CHAR('Y'),
-  EL_CHAR('N'),
-  EL_CHAR('A'),
-
-  EL_CHAR('B'),
-  EL_CHAR('L'),
-  EL_CHAR('A'),
-  EL_CHAR('S'),
+  EL_EMPTY,
+  EL_EMPTY
+};
+int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash);
 
-  EL_CHAR_MINUS,
+int editor_el_chars[] =
+{
   EL_CHAR('T'),
   EL_CHAR('E'),
-  EL_CHAR('R'),
-  */
-
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
+  EL_CHAR('X'),
+  EL_CHAR('T'),
 
   EL_CHAR(' '),
   EL_CHAR('!'),
@@ -1265,18 +1307,310 @@ int editor_element[] =
   EL_CHAR('Ö'),
   EL_CHAR('Ü'),
   EL_CHAR('^'),
-  EL_CHAR(' ')
+  EL_CHAR('_'),
+
+  EL_CHAR(' '),
+  EL_CHAR('°'),
+  EL_CHAR('´'),
+  EL_CHAR('|')
+};
+int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars);
+
+int editor_el_custom[] =
+{
+  EL_CHAR('C'),
+  EL_CHAR('U'),
+  EL_CHAR('S'),
+  EL_CHAR('-'),
+
+  EL_CHAR('T'),
+  EL_CHAR('O'),
+  EL_CHAR('M'),
+  EL_CHAR(' '),
+
+  EL_CHAR('E'),
+  EL_CHAR('L'),
+  EL_CHAR('E'),
+  EL_CHAR('M'),
+
+  EL_CHAR('E'),
+  EL_CHAR('N'),
+  EL_CHAR('T'),
+  EL_CHAR('S'),
+
+  EL_CUSTOM_START + 0,
+  EL_CUSTOM_START + 1,
+  EL_CUSTOM_START + 2,
+  EL_CUSTOM_START + 3,
+
+  EL_CUSTOM_START + 4,
+  EL_CUSTOM_START + 5,
+  EL_CUSTOM_START + 6,
+  EL_CUSTOM_START + 7,
+
+  EL_CUSTOM_START + 8,
+  EL_CUSTOM_START + 9,
+  EL_CUSTOM_START + 10,
+  EL_CUSTOM_START + 11,
+
+  EL_CUSTOM_START + 12,
+  EL_CUSTOM_START + 13,
+  EL_CUSTOM_START + 14,
+  EL_CUSTOM_START + 15,
+
+  EL_CUSTOM_START + 16,
+  EL_CUSTOM_START + 17,
+  EL_CUSTOM_START + 18,
+  EL_CUSTOM_START + 19,
+
+  EL_CUSTOM_START + 20,
+  EL_CUSTOM_START + 21,
+  EL_CUSTOM_START + 22,
+  EL_CUSTOM_START + 23,
+
+  EL_CUSTOM_START + 24,
+  EL_CUSTOM_START + 25,
+  EL_CUSTOM_START + 26,
+  EL_CUSTOM_START + 27,
+
+  EL_CUSTOM_START + 28,
+  EL_CUSTOM_START + 29,
+  EL_CUSTOM_START + 30,
+  EL_CUSTOM_START + 31,
+
+  EL_CUSTOM_START + 32,
+  EL_CUSTOM_START + 33,
+  EL_CUSTOM_START + 34,
+  EL_CUSTOM_START + 35,
+
+  EL_CUSTOM_START + 36,
+  EL_CUSTOM_START + 37,
+  EL_CUSTOM_START + 38,
+  EL_CUSTOM_START + 39,
+
+  EL_CUSTOM_START + 40,
+  EL_CUSTOM_START + 41,
+  EL_CUSTOM_START + 42,
+  EL_CUSTOM_START + 43,
+
+  EL_CUSTOM_START + 44,
+  EL_CUSTOM_START + 45,
+  EL_CUSTOM_START + 46,
+  EL_CUSTOM_START + 47,
+
+  EL_CUSTOM_START + 48,
+  EL_CUSTOM_START + 49,
+  EL_CUSTOM_START + 50,
+  EL_CUSTOM_START + 51,
+
+  EL_CUSTOM_START + 52,
+  EL_CUSTOM_START + 53,
+  EL_CUSTOM_START + 54,
+  EL_CUSTOM_START + 55,
+
+  EL_CUSTOM_START + 56,
+  EL_CUSTOM_START + 57,
+  EL_CUSTOM_START + 58,
+  EL_CUSTOM_START + 59,
+
+  EL_CUSTOM_START + 60,
+  EL_CUSTOM_START + 61,
+  EL_CUSTOM_START + 62,
+  EL_CUSTOM_START + 63,
+
+  EL_CUSTOM_START + 64,
+  EL_CUSTOM_START + 65,
+  EL_CUSTOM_START + 66,
+  EL_CUSTOM_START + 67,
+
+  EL_CUSTOM_START + 68,
+  EL_CUSTOM_START + 69,
+  EL_CUSTOM_START + 70,
+  EL_CUSTOM_START + 71,
+
+  EL_CUSTOM_START + 72,
+  EL_CUSTOM_START + 73,
+  EL_CUSTOM_START + 74,
+  EL_CUSTOM_START + 75,
+
+  EL_CUSTOM_START + 76,
+  EL_CUSTOM_START + 77,
+  EL_CUSTOM_START + 78,
+  EL_CUSTOM_START + 79,
+
+  EL_CUSTOM_START + 80,
+  EL_CUSTOM_START + 81,
+  EL_CUSTOM_START + 82,
+  EL_CUSTOM_START + 83,
+
+  EL_CUSTOM_START + 84,
+  EL_CUSTOM_START + 85,
+  EL_CUSTOM_START + 86,
+  EL_CUSTOM_START + 87,
+
+  EL_CUSTOM_START + 88,
+  EL_CUSTOM_START + 89,
+  EL_CUSTOM_START + 90,
+  EL_CUSTOM_START + 91,
+
+  EL_CUSTOM_START + 92,
+  EL_CUSTOM_START + 93,
+  EL_CUSTOM_START + 94,
+  EL_CUSTOM_START + 95,
+
+  EL_CUSTOM_START + 96,
+  EL_CUSTOM_START + 97,
+  EL_CUSTOM_START + 98,
+  EL_CUSTOM_START + 99,
+
+  EL_CUSTOM_START + 100,
+  EL_CUSTOM_START + 101,
+  EL_CUSTOM_START + 102,
+  EL_CUSTOM_START + 103,
+
+  EL_CUSTOM_START + 104,
+  EL_CUSTOM_START + 105,
+  EL_CUSTOM_START + 106,
+  EL_CUSTOM_START + 107,
+
+  EL_CUSTOM_START + 108,
+  EL_CUSTOM_START + 109,
+  EL_CUSTOM_START + 110,
+  EL_CUSTOM_START + 111,
+
+  EL_CUSTOM_START + 112,
+  EL_CUSTOM_START + 113,
+  EL_CUSTOM_START + 114,
+  EL_CUSTOM_START + 115,
+
+  EL_CUSTOM_START + 116,
+  EL_CUSTOM_START + 117,
+  EL_CUSTOM_START + 118,
+  EL_CUSTOM_START + 119,
+
+  EL_CUSTOM_START + 120,
+  EL_CUSTOM_START + 121,
+  EL_CUSTOM_START + 122,
+  EL_CUSTOM_START + 123,
+
+  EL_CUSTOM_START + 124,
+  EL_CUSTOM_START + 125,
+  EL_CUSTOM_START + 126,
+  EL_CUSTOM_START + 127
 };
-int elements_in_list = sizeof(editor_element)/sizeof(int);
+int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom);
+
+int *editor_elements = NULL;	/* dynamically allocated */
+int num_editor_elements = 0;	/* dynamically determined */
+
+struct
+{
+  boolean *setup_value;
+  int *element_list;
+  int *element_list_size;
+
+  boolean last_setup_value;
+}
+editor_elements_info[] =
+{
+  { &setup.editor.el_boulderdash,	editor_el_boulderdash,
+    &num_editor_el_boulderdash						},
+  { &setup.editor.el_emerald_mine,	editor_el_emerald_mine,
+    &num_editor_el_emerald_mine						},
+  { &setup.editor.el_more,		editor_el_more,
+    &num_editor_el_more							},
+  { &setup.editor.el_sokoban,		editor_el_sokoban,
+    &num_editor_el_sokoban						},
+  { &setup.editor.el_supaplex,		editor_el_supaplex,
+    &num_editor_el_supaplex						},
+  { &setup.editor.el_diamond_caves,	editor_el_diamond_caves,
+    &num_editor_el_diamond_caves					},
+  { &setup.editor.el_dx_boulderdash,	editor_el_dx_boulderdash,
+    &num_editor_el_dx_boulderdash					},
+  { &setup.editor.el_chars,		editor_el_chars,
+    &num_editor_el_chars						},
+  { &setup.editor.el_custom,		editor_el_custom,
+    &num_editor_el_custom						},
+  { NULL,				NULL,
+    NULL								}
+};
+
+static void ReinitializeElementList()
+{
+  int pos = 0;
+  int i, j;
+
+  if (editor_elements != NULL)
+    free(editor_elements);
+
+  num_editor_elements = 0;
+
+  /* determine size of element list */
+  for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+    if (*editor_elements_info[i].setup_value)
+      num_editor_elements += *editor_elements_info[i].element_list_size;
+
+  if (num_editor_elements < ED_NUM_ELEMENTLIST_BUTTONS)
+  {
+    /* workaround: offer at least as many elements as element buttons exist */
+    int list_nr = 1;	/* see above: editor_elements_info for Emerald Mine */
+
+    *editor_elements_info[list_nr].setup_value = TRUE;
+    num_editor_elements += *editor_elements_info[list_nr].element_list_size;
+  }
+
+  editor_elements = checked_malloc(num_editor_elements * sizeof(int));
+
+  /* fill element list */
+  for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+    if (*editor_elements_info[i].setup_value)
+      for (j=0; j<*editor_elements_info[i].element_list_size; j++)
+	editor_elements[pos++] = editor_elements_info[i].element_list[j];
+}
+
+static void ReinitializeElementListButtons()
+{
+  static boolean initialization_needed = TRUE;
+  int i;
+
+  if (!initialization_needed)	/* check if editor element setup has changed */
+    for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+      if (editor_elements_info[i].last_setup_value !=
+	  *editor_elements_info[i].setup_value)
+	initialization_needed = TRUE;
+
+  if (!initialization_needed)
+    return;
+
+  FreeLevelEditorGadgets();
+  CreateLevelEditorGadgets();
+
+  /* store current setup values for next invocation of this function */
+  for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+    editor_elements_info[i].last_setup_value =
+      *editor_elements_info[i].setup_value;
+
+  initialization_needed = FALSE;
+}
 
 static char *getElementInfoText(int element)
 {
-  char *info_text = "unknown";
+  char *info_text = NULL;
 
   if (element < NUM_FILE_ELEMENTS)
-    info_text = element_info[element].editor_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;
+  }
+
+  if (info_text == NULL)
+  {
+    info_text = "unknown";
+
     Error(ERR_WARN, "no element description for element %d", element);
+  }
 
   return info_text;
 }
@@ -1313,7 +1647,7 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 
 static void CreateControlButtons()
 {
-  Bitmap *gd_bitmap = pix[PIX_DOOR];
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int i;
@@ -1480,6 +1814,7 @@ static void CreateControlButtons()
     int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
     int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
     int id = GADGET_ID_ELEMENTLIST_FIRST + i;
+    int element = editor_elements[i];
 
     event_mask = GD_EVENT_RELEASED;
 
@@ -1490,14 +1825,13 @@ static void CreateControlButtons()
     gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
     gd_y  = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
 
-    getMiniGraphicSource(el2gfx(editor_element[i]),
-			 &deco_bitmap, &deco_x, &deco_y);
+    getMiniGraphicSource(el2edimg(element), &deco_bitmap, &deco_x, &deco_y);
     deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
     deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_CUSTOM_TYPE_ID, i,
-		      GDI_INFO_TEXT, getElementInfoText(editor_element[i]),
+		      GDI_INFO_TEXT, getElementInfoText(element),
 		      GDI_X, DX + gd_xoffset,
 		      GDI_Y, DY + gd_yoffset,
 		      GDI_WIDTH, ED_ELEMENTLIST_XSIZE,
@@ -1534,7 +1868,7 @@ static void CreateCounterButtons()
 
     for (j=0; j<2; j++)
     {
-      Bitmap *gd_bitmap = pix[PIX_DOOR];
+      Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
       struct GadgetInfo *gi;
       int id = (j == 0 ?
 		counterbutton_info[i].gadget_id_down :
@@ -1756,7 +2090,7 @@ static void CreateTextInputGadgets()
 
   for (i=0; i<ED_NUM_TEXTINPUT; i++)
   {
-    Bitmap *gd_bitmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x, gd_y;
     struct GadgetInfo *gi;
     unsigned long event_mask;
@@ -1803,7 +2137,7 @@ static void CreateScrollbarGadgets()
   for (i=0; i<ED_NUM_SCROLLBARS; i++)
   {
     int id = scrollbar_info[i].gadget_id;
-    Bitmap *gd_bitmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x1, gd_x2, gd_y1, gd_y2;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
@@ -1811,7 +2145,7 @@ static void CreateScrollbarGadgets()
 
     if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
     {
-      items_max = elements_in_list / ED_ELEMENTLIST_BUTTONS_HORIZ;
+      items_max = num_editor_elements / ED_ELEMENTLIST_BUTTONS_HORIZ;
       items_visible = ED_ELEMENTLIST_BUTTONS_VERT;
       item_position = 0;
     }
@@ -1868,7 +2202,7 @@ static void CreateScrollbarGadgets()
 
 static void CreateCheckbuttonGadgets()
 {
-  Bitmap *gd_bitmap = pix[PIX_DOOR];
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
@@ -1951,6 +2285,8 @@ static void CreateCheckbuttonGadgets()
 
 void CreateLevelEditorGadgets()
 {
+  ReinitializeElementList();
+
   CreateControlButtons();
   CreateCounterButtons();
   CreateDrawingAreas();
@@ -1959,6 +2295,14 @@ void CreateLevelEditorGadgets()
   CreateCheckbuttonGadgets();
 }
 
+void FreeLevelEditorGadgets()
+{
+  int i;
+
+  for (i=0; i<NUM_EDITOR_GADGETS; i++)
+    FreeGadget(level_editor_gadget[i]);
+}
+
 static void MapCounterButtons(int id)
 {
   MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
@@ -2101,14 +2445,70 @@ static boolean LevelContainsPlayer()
 
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
-      if (Feld[x][y] == EL_SPIELFIGUR ||
-	  Feld[x][y] == EL_SPIELER1 ||
+      if (Feld[x][y] == EL_PLAYER1 ||
 	  Feld[x][y] == EL_SP_MURPHY) 
 	player_found = TRUE;
 
   return player_found;
 }
 
+static void CopyPlayfield(short src[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
+			  short dst[MAX_LEV_FIELDX][MAX_LEV_FIELDY])
+{
+  int x, y;
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++) 
+      dst[x][y] = src[x][y];
+}
+
+static void CopyCustomElementPropertiesToEditor()
+{
+  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_MASSIVE) != 0 ? TRUE : FALSE);
+
+    custom_element_properties[i].can_fall =
+      ((properties & EP_BIT_CAN_FALL) != 0 ? TRUE : FALSE);
+
+    custom_element_properties[i].slippery =
+      ((properties & EP_BIT_SLIPPERY) != 0 ? TRUE : FALSE);
+  }
+}
+
+static void CopyCustomElementPropertiesToGame()
+{
+  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_MASSIVE;
+    else
+      Properties1[element] &= ~EP_BIT_MASSIVE;
+
+    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].slippery)
+      Properties1[element] |= EP_BIT_SLIPPERY;
+    else
+      Properties1[element] &= ~EP_BIT_SLIPPERY;
+  }
+}
+
 void DrawLevelEd()
 {
   CloseDoor(DOOR_CLOSE_ALL);
@@ -2116,15 +2516,8 @@ void DrawLevelEd()
 
   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];
-
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-	Ur[x][y] = FieldBackup[x][y];
+    CopyPlayfield(Ur, Feld);
+    CopyPlayfield(FieldBackup, Ur);
 
     level_editor_test_game = FALSE;
   }
@@ -2138,33 +2531,36 @@ void DrawLevelEd()
   }
 
   /* copy default editor door content to main double buffer */
-  BlitBitmap(pix[PIX_DOOR], drawto,
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
   /* draw mouse button brush elements */
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		     el2gfx(new_element1));
+		     el2edimg(new_element1));
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		     el2gfx(new_element2));
+		     el2edimg(new_element2));
   DrawMiniGraphicExt(drawto,
 		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		     el2gfx(new_element3));
+		     el2edimg(new_element3));
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
 
   /* draw new control window */
-  BlitBitmap(pix[PIX_DOOR], drawto,
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
 
   redraw_mask |= REDRAW_ALL;
 
+  ReinitializeElementListButtons();	/* only needed after setup changes */
+
+  UnmapTapeButtons();
   MapControlButtons();
 
   /* copy actual editor door content to door double buffer for OpenDoor() */
-  BlitBitmap(drawto, pix[PIX_DB_DOOR],
+  BlitBitmap(drawto, bitmap_db_door,
 	     DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
   DrawEditModeWindow();
@@ -2323,21 +2719,21 @@ static void PickDrawingElement(int button, int element)
     new_element1 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-		       el2gfx(new_element1));
+		       el2edimg(new_element1));
   }
   else if (button == 2)
   {
     new_element2 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-		       el2gfx(new_element2));
+		       el2edimg(new_element2));
   }
   else
   {
     new_element3 = element;
     DrawMiniGraphicExt(drawto,
 		       DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-		       el2gfx(new_element3));
+		       el2edimg(new_element3));
   }
 
   redraw_mask |= REDRAW_DOOR_1;
@@ -2345,40 +2741,49 @@ static void PickDrawingElement(int button, int element)
 
 static void DrawDrawingWindow()
 {
+  SetMainBackgroundImage(IMG_UNDEFINED);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
+
   AdjustDrawingAreaGadgets();
   AdjustLevelScrollPosition();
   AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL);
   AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL);
+
   DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   MapMainDrawingArea();
 }
 
+static void DrawElementBorder(int dest_x, int dest_y, int width, int height)
+{
+  int border_graphic = IMG_SAND;
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int num_mini_tilex = width / MINI_TILEX + 1;
+  int num_mini_tiley = width / MINI_TILEY + 1;
+  int x, y;
+
+  getMiniGraphicSource(border_graphic, &src_bitmap, &src_x, &src_y);
+
+  for (y=0; y < num_mini_tiley; y++)
+    for (x=0; x < num_mini_tilex; x++)
+      BlitBitmap(src_bitmap, drawto, src_x, src_y, MINI_TILEX, MINI_TILEY,
+		 dest_x - MINI_TILEX / 2 + x * MINI_TILEX,
+		 dest_y - MINI_TILEY / 2 + y * MINI_TILEY);
+
+  ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2);
+}
+
 static void DrawRandomPlacementBackgroundArea()
 {
   int area_x = ED_AREA_RANDOM_BACKGROUND_XPOS / MINI_TILEX;
   int area_y = ED_AREA_RANDOM_BACKGROUND_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_RANDOM_BACKGROUND_XPOS;
   int area_sy = SY + ED_AREA_RANDOM_BACKGROUND_YPOS;
-  int x, y;
 
   ElementContent[0][0][0] = random_placement_background_element;
 
-  /* draw decorative border for the object */
-  for (y=0; y<2; y++)
-    for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH);
-
-  ClearRectangle(drawto,
-		 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
-		 MINI_TILEX + 2, MINI_TILEY + 2);
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
-	     area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
-
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
   DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
   MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND);
@@ -2396,6 +2801,7 @@ static void DrawLevelInfoWindow()
   int font_color = FC_GREEN;
   int i, x, y;
 
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_LEVEL);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
@@ -2483,29 +2889,15 @@ static void DrawAmoebaContentArea()
   int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
   int font_color = FC_GREEN;
-  int x, y;
 
   ElementContent[0][0][0] = level.amoeba_content;
 
-  /* draw decorative border for the object */
-  for (y=0; y<2; y++)
-    for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH);
-
-  ClearRectangle(drawto,
-		 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
-		 MINI_TILEX + 2, MINI_TILEY + 2);
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
-	     area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
+  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
   DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba",
 	   FS_SMALL, font_color);
 
-  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
-
   MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
 }
 
@@ -2538,28 +2930,12 @@ static void DrawElementContentAreas()
   MapCounterButtons(counter_id);
 
   /* delete content areas in case of reducing number of them */
-  ClearRectangle(backbuffer,
-		 SX, area_sy - MINI_TILEX,
-		 SXSIZE, 12 * MINI_TILEY);
+  DrawBackground(SX, area_sy - MINI_TILEX, SXSIZE, 12 * MINI_TILEY);
 
-  /* draw some decorative border for the objects */
   for (i=0; i<level.num_yam_contents; i++)
-  {
-    for (y=0; y<4; y++)
-      for (x=0; x<4; x++)
-	DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
-			EL_ERDREICH);
-
-    ClearRectangle(drawto,
-		   area_sx + 5 * (i % 4) * MINI_TILEX + MINI_TILEX/2 - 1,
-		   area_sy + 6 * (i / 4) * MINI_TILEY + MINI_TILEY/2 - 1,
-		   3 * MINI_TILEX + 2, 3 * MINI_TILEY + 2);
-  }
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     area_sx, area_sy, (5 * 4 + 1) * MINI_TILEX, 11 * MINI_TILEY,
-	     area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+    DrawElementBorder(area_sx + 5 * (i % 4) * MINI_TILEX,
+		      area_sy + 6 * (i / 4) * MINI_TILEY,
+		      3 * MINI_TILEX, 3 * MINI_TILEY);
 
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 0 * MINI_TILEY + 1,
 	   "Content", FS_SMALL, font_color);
@@ -2610,87 +2986,70 @@ static void DrawPropertiesWindow()
     char *text;
   } elements_with_counter[] =
   {
-    { 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_RIGHT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_KAEFER_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_KAEFER_LEFT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_KAEFER_DOWN,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_LEFT,&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_DOWN,&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_FLIEGER_RIGHT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FLIEGER_UP,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FLIEGER_LEFT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FLIEGER_DOWN,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_RIGHT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_UP,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_LEFT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_DOWN,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_MAMPFER,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
-    { EL_MAMPFER2,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
+    { 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_KOKOSNUSS,	&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
-    { EL_DYNAMITE_INACTIVE,&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_MAGIC_WALL_OFF,&level.time_magic_wall,		TEXT_DURATION },
-    { EL_ABLENK_AUS,	&level.time_wheel,		TEXT_DURATION },
+    { EL_NUT,		&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
+    { EL_DYNAMITE,	&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
+    { EL_KEY1,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_KEY2,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_KEY3,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_KEY4,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY1_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY2_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY3_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY4_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_SETTINGS_ELEMENT);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
   DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
 	   "Element Settings", FS_BIG, FC_YELLOW);
 
-  /* draw some decorative border for the object */
-  for (y=0; y<3; y++)
-    for (x=0; x<3; x++)
-      DrawMiniElement(xstart + x , ystart + y, EL_ERDREICH);
-
-  ClearRectangle(drawto,
-		 SX + xstart * MINI_TILEX + MINI_TILEX/2 - 1,
-		 SY + ystart * MINI_TILEY + MINI_TILEY/2 - 1,
-		 TILEX + 2, TILEY + 2);
+  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);
 
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     SX + xstart * MINI_TILEX,
-	     SY + ystart * MINI_TILEY,
-	     2 * TILEX, 2 * TILEY,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
-
-  DrawGraphic(xstart/2, ystart/2, el2gfx(properties_element));
-
-  /* copy the whole stuff to the definitive location */
-  BlitBitmap(drawto, drawto,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY,
-	     2 * TILEX, 2 * TILEY,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
+  FrameCounter = 0;	/* restart animation frame counter */
 
   DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
 	    font_color, getElementInfoText(properties_element));
@@ -2753,6 +3112,49 @@ static void DrawPropertiesWindow()
 		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
     MapCheckbuttonGadget(i);
   }
+
+  if (IS_CUSTOM_ELEMENT(properties_element))
+  {
+    int nr = properties_element - EL_CUSTOM_START;
+
+    CopyCustomElementPropertiesToEditor();
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].indestructible;
+
+    DrawTextF(x, y, font_color, 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_CAN_FALL;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].can_fall;
+
+    DrawTextF(x, y, font_color, 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_SLIPPERY;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].slippery;
+
+    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+  }
 }
 
 static void DrawLineElement(int sx, int sy, int element, boolean change_level)
@@ -3143,7 +3545,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
   else if (letter == 'ü' || letter == 'Ü')
     letter_element = EL_CHAR_UE;
   else if (letter == '^')
-    letter_element = EL_CHAR_COPY;
+    letter_element = EL_CHAR_COPYRIGHT;
   else
     letter_element = EL_CHAR_ASCII0 + letter;
 
@@ -3447,20 +3849,20 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	}
 	else if (new_element != Feld[lx][ly])
 	{
-	  if (new_element == EL_SPIELFIGUR)
+	  if (new_element == EL_PLAYER1)
 	  {
 	    /* remove player at old position */
 	    for(y=0; y<lev_fieldy; y++)
 	    {
 	      for(x=0; x<lev_fieldx; x++)
 	      {
-		if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
+		if (Feld[x][y] == EL_PLAYER1)
 		{
-		  Feld[x][y] = EL_LEERRAUM;
+		  Feld[x][y] = EL_EMPTY;
 		  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
 		      y - level_ypos >= 0 && y - level_ypos < ed_fieldy)
 		    DrawMiniElement(x - level_xpos, y - level_ypos,
-				    EL_LEERRAUM);
+				    EL_EMPTY);
 		}
 	      }
 	    }
@@ -3475,11 +3877,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	DrawMiniGraphicExt(drawto,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2gfx(new_element));
+			   el2edimg(new_element));
 	DrawMiniGraphicExt(window,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2gfx(new_element));
+			   el2edimg(new_element));
 
 	if (id == GADGET_ID_AMOEBA_CONTENT)
 	  level.amoeba_content = new_element;
@@ -3664,7 +4066,13 @@ static void HandleRadiobuttons(struct GadgetInfo *gi)
 
 static void HandleCheckbuttons(struct GadgetInfo *gi)
 {
-  *checkbutton_info[gi->custom_type_id].value ^= TRUE;
+  int type_id = gi->custom_type_id;
+
+  *checkbutton_info[type_id].value ^= TRUE;
+
+  if (type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST &&
+      type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST)
+    CopyCustomElementPropertiesToGame();
 }
 
 static void HandleControlButtons(struct GadgetInfo *gi)
@@ -3785,8 +4193,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
 	if (element_shift < 0)
 	  element_shift = 0;
-	if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
-	  element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+	if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+	  element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
 
 	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
 		     GDI_SCROLLBAR_ITEM_POSITION,
@@ -3798,10 +4206,10 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
 	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
 	struct GadgetDesign *gd = &gi->deco.design;
-	int element = editor_element[element_shift + i];
+	int element = editor_elements[element_shift + i];
 
 	UnmapGadget(gi);
-	getMiniGraphicSource(el2gfx(element), &gd->bitmap, &gd->x, &gd->y);
+	getMiniGraphicSource(el2edimg(element), &gd->bitmap, &gd->x, &gd->y);
 	ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
 	MapGadget(gi);
       }
@@ -3889,7 +4297,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
     case GADGET_ID_CLEAR:
       for(x=0; x<MAX_LEV_FIELDX; x++) 
 	for(y=0; y<MAX_LEV_FIELDY; y++) 
-	  Feld[x][y] = (button == 1 ? EL_LEERRAUM : new_element);
+	  Feld[x][y] = (button == 1 ? EL_EMPTY : new_element);
       CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
 
       DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
@@ -3908,9 +4316,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       {
 	if (Request("Save this level and kill the old ?", REQ_ASK))
 	{
-	  for(x=0; x<lev_fieldx; x++)
-	    for(y=0; y<lev_fieldy; y++) 
-	      Ur[x][y] = Feld[x][y];
+	  CopyPlayfield(Feld, Ur);
+
 	  SaveLevel(level_nr);
 	}
       }
@@ -3924,13 +4331,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	if (LevelChanged())
 	  level.game_version = GAME_VERSION_ACTUAL;
 
-	for(x=0; x<lev_fieldx; x++)
-	  for(y=0; y<lev_fieldy; y++)
-	    FieldBackup[x][y] = Ur[x][y];
-
-	for(x=0; x<lev_fieldx; x++)
-	  for(y=0; y<lev_fieldy; y++)
-	    Ur[x][y] = Feld[x][y];
+	CopyPlayfield(Ur, FieldBackup);
+	CopyPlayfield(Feld, Ur);
 
 	UnmapLevelEditorGadgets();
 	UndrawSpecialEditorDoor();
@@ -3958,7 +4360,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	  id <= GADGET_ID_ELEMENTLIST_LAST)
       {
 	int element_position = id - GADGET_ID_ELEMENTLIST_FIRST;
-	int new_element = editor_element[element_position + element_shift];
+	int new_element = editor_elements[element_position + element_shift];
 
 	PickDrawingElement(button, new_element);
 
@@ -4062,11 +4464,32 @@ void HandleLevelEditorKeyInput(Key key)
   }
 }
 
+void HandleLevelEditorIdle()
+{
+  static unsigned long action_delay = 0;
+  unsigned long action_delay_value = GameFrameDelay;
+  int xpos = 1, ypos = 2;
+
+  if (edit_mode != ED_MODE_PROPERTIES)
+    return;
+
+  if (!DelayReached(&action_delay, action_delay_value))
+    return;
+
+  DrawGraphicAnimationExt(drawto,
+			  SX + xpos * TILEX,
+			  SY + ypos * TILEY + MINI_TILEY / 2,
+			  el2edimg(properties_element), -1, NO_MASKING);
+
+  MarkTileDirty(xpos, ypos);
+  MarkTileDirty(xpos, ypos + 1);
+
+  FrameCounter++;	/* increase animation frame counter */
+}
+
 void ClearEditorGadgetInfoText()
 {
-  ClearRectangle(drawto,
-		 INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
-  redraw_mask |= REDRAW_FIELD;
+  DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
 
 void HandleEditorGadgetInfoText(void *ptr)
@@ -4259,7 +4682,7 @@ void RequestExitLevelEditor(boolean ask_if_level_has_changed)
   else
   {
     CloseDoor(DOOR_CLOSE_1);
-    BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+    BlitBitmap(bitmap_db_door, bitmap_db_door,
 	       DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
 	       DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
     OpenDoor(DOOR_OPEN_1);