rnd-20030403-1-src
[rocksndiamonds.git] / src / editor.c
index 0b62ca192c91ba7f153f274a5d46f5dea9b45a99..00cda340cc0053cedec3e928c13be96f5f673a6e 100644 (file)
 #define ED_STICKYBUTTON_YPOS           (ED_BUTTON_MINUS_YPOS + 66)
 
 /* 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
-
-/* some values for text input and counter gadgets */
-#define ED_BUTTON_COUNT_YPOS   60
-#define ED_BUTTON_COUNT_XSIZE  20
-#define ED_BUTTON_COUNT_YSIZE  20
-#define ED_WIN_COUNT_XPOS      (2 + ED_BUTTON_COUNT_XSIZE + 2)
-#define ED_WIN_COUNT_YPOS      ED_BUTTON_COUNT_YPOS
-#define ED_WIN_COUNT_XSIZE     52
-#define ED_WIN_COUNT_YSIZE     ED_BUTTON_COUNT_YSIZE
-#define ED_WIN_COUNT2_XPOS     27
-#define ED_WIN_COUNT2_YPOS     3
-#define ED_WIN_COUNT2_XSIZE    46
-#define ED_WIN_COUNT2_YSIZE    ED_BUTTON_COUNT_YSIZE
-
-#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
+#define ED_BUTTON_ELEM_XPOS            6
+#define ED_BUTTON_ELEM_YPOS            30
+#define ED_BUTTON_ELEM_XSIZE           22
+#define ED_BUTTON_ELEM_YSIZE           22
+
+/* some values for text input, selectbox and counter gadgets */
+#define ED_BUTTON_COUNT_YPOS           60
+#define ED_BUTTON_COUNT_XSIZE          20
+#define ED_BUTTON_COUNT_YSIZE          20
+#define ED_WIN_COUNT_XPOS              (2 + ED_BUTTON_COUNT_XSIZE + 2)
+#define ED_WIN_COUNT_YPOS              ED_BUTTON_COUNT_YPOS
+#define ED_WIN_COUNT_XSIZE             52
+#define ED_WIN_COUNT_YSIZE             ED_BUTTON_COUNT_YSIZE
+#define ED_WIN_COUNT2_XPOS             27
+#define ED_WIN_COUNT2_YPOS             3
+#define ED_WIN_COUNT2_XSIZE            46
+#define ED_WIN_COUNT2_YSIZE            ED_BUTTON_COUNT_YSIZE
+
+#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
+
+#define ED_SELECTBOX_XPOS              ED_WIN_COUNT_XPOS
+#define ED_SELECTBOX_YPOS              (ED_WIN_COUNT_YPOS + 2 + \
+                                        ED_WIN_COUNT_YSIZE)
+#define ED_SELECTBOX_XSIZE             ED_WIN_COUNT_XSIZE
+#define ED_SELECTBOX_YSIZE             ED_WIN_COUNT_YSIZE
 
 /* editor gadget identifiers */
 
 #define GADGET_ID_LEVEL_NAME           60
 #define GADGET_ID_LEVEL_AUTHOR         61
 
+/* selectbox identifiers */
+#define GADGET_ID_SELECTBOX_TEST       62
+
 /* gadgets for scrolling of drawing area */
-#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
+#define GADGET_ID_SCROLL_UP            63
+#define GADGET_ID_SCROLL_DOWN          64
+#define GADGET_ID_SCROLL_LEFT          65
+#define GADGET_ID_SCROLL_RIGHT         66
+#define GADGET_ID_SCROLL_HORIZONTAL    67
+#define GADGET_ID_SCROLL_VERTICAL      68
 
 /* gadgets for scrolling element list */
-#define GADGET_ID_SCROLL_LIST_UP       68
-#define GADGET_ID_SCROLL_LIST_DOWN     69
-#define GADGET_ID_SCROLL_LIST_VERTICAL 70
+#define GADGET_ID_SCROLL_LIST_UP       69
+#define GADGET_ID_SCROLL_LIST_DOWN     70
+#define GADGET_ID_SCROLL_LIST_VERTICAL 71
 
 /* 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_CAN_SMASH     80
-#define GADGET_ID_CUSTOM_PUSHABLE      81
-#define GADGET_ID_CUSTOM_SLIPPERY      82
+#define GADGET_ID_RANDOM_PERCENTAGE    72
+#define GADGET_ID_RANDOM_QUANTITY      73
+#define GADGET_ID_RANDOM_RESTRICTED    74
+#define GADGET_ID_DOUBLE_SPEED         75
+#define GADGET_ID_GRAVITY              76
+#define GADGET_ID_STICK_ELEMENT                77
+#define GADGET_ID_EM_SLIPPERY_GEMS     78
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE        79
+#define GADGET_ID_CUSTOM_CAN_FALL      80
+#define GADGET_ID_CUSTOM_CAN_SMASH     81
+#define GADGET_ID_CUSTOM_PUSHABLE      82
+#define GADGET_ID_CUSTOM_SLIPPERY      83
 
 /* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST    83
+#define GADGET_ID_ELEMENTLIST_FIRST    84
 #define GADGET_ID_ELEMENTLIST_LAST     (GADGET_ID_ELEMENTLIST_FIRST +  \
                                        ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
 #define ED_TEXTINPUT_ID_LEVEL_FIRST    ED_TEXTINPUT_ID_LEVEL_NAME
 #define ED_TEXTINPUT_ID_LEVEL_LAST     ED_TEXTINPUT_ID_LEVEL_AUTHOR
 
+/* values for selectbox gadgets */
+#define ED_SELECTBOX_ID_TEST           0
+
+#define ED_NUM_SELECTBOX               1
+
 /* values for checkbutton gadgets */
 #define ED_CHECKBUTTON_ID_DOUBLE_SPEED         0
 #define ED_CHECKBUTTON_ID_GRAVITY              1
 #define INFOTEXT_YPOS                  (SY + SYSIZE - MINI_TILEX + 2)
 #define INFOTEXT_XSIZE                 SXSIZE
 #define INFOTEXT_YSIZE                 MINI_TILEX
-#define MAX_INFOTEXT_LEN               (SXSIZE / FONT2_XSIZE)
 
 static struct
 {
@@ -402,28 +416,28 @@ static struct
   char *text;
 } control_info[ED_NUM_CTRL_BUTTONS] =
 {
-  { 's', "draw single items" },
-  { 'd', "draw connected items" },
-  { 'l', "draw lines" },
-  { 'a', "draw arcs" },
-  { 'r', "draw outline rectangles" },
-  { 'R', "draw filled rectangles" },
-  { '\0', "wrap (rotate) level up" },
-  { 't', "enter text elements" },
-  { 'f', "flood fill" },
-  { '\0', "wrap (rotate) level left" },
-  { '?', "properties of drawing element" },
-  { '\0', "wrap (rotate) level right" },
-  { '\0', "random element placement" },
-  { 'b', "grab brush" },
-  { '\0', "wrap (rotate) level down" },
-  { ',', "pick drawing element" },
-  { 'U', "undo last operation" },
-  { 'I', "level properties" },
-  { 'S', "save level" },
-  { 'C', "clear level" },
-  { 'T', "test level" },
-  { 'E', "exit level editor" }
+  { 's',       "draw single items"             },
+  { 'd',       "draw connected items"          },
+  { 'l',       "draw lines"                    },
+  { 'a',       "draw arcs"                     },
+  { 'r',       "draw outline rectangles"       },
+  { 'R',       "draw filled rectangles"        },
+  { '\0',      "wrap (rotate) level up"        },
+  { 't',       "enter text elements"           },
+  { 'f',       "flood fill"                    },
+  { '\0',      "wrap (rotate) level left"      },
+  { '?',       "properties of drawing element" },
+  { '\0',      "wrap (rotate) level right"     },
+  { '\0',      "random element placement"      },
+  { 'b',       "grab brush"                    },
+  { '\0',      "wrap (rotate) level down"      },
+  { ',',       "pick drawing element"          },
+  { 'U',       "undo last operation"           },
+  { 'I',       "level properties"              },
+  { 'S',       "save level"                    },
+  { 'C',       "clear level"                   },
+  { 'T',       "test level"                    },
+  { 'E',       "exit level editor"             }
 };
 
 /* values for random placement */
@@ -554,6 +568,34 @@ static struct
   }
 };
 
+static char *test_values[] =
+{
+  "test 1",
+  "test 2",
+  "dieser test-text ist viel zu lang fuer die selectbox",
+  "letzter text"
+};
+static int test_index = 0;
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+  int size;
+  char **values;
+  int *index;
+  char *text, *infotext;
+} selectbox_info[ED_NUM_SELECTBOX] =
+{
+  {
+    ED_SETTINGS_XPOS,                  ED_COUNTER_YPOS(3),
+    GADGET_ID_SELECTBOX_TEST,
+    MAX_PLAYER_NAME_LEN,
+    test_values, &test_index,
+    "test:", "test-selectbox entry"
+  },
+};
+
 static struct
 {
   int xpos, ypos;
@@ -764,6 +806,7 @@ static void CopyLevelToUndoBuffer(int);
 static void HandleDrawingAreas(struct GadgetInfo *);
 static void HandleCounterButtons(struct GadgetInfo *);
 static void HandleTextInputGadgets(struct GadgetInfo *);
+static void HandleSelectboxGadgets(struct GadgetInfo *);
 static void HandleRadiobuttons(struct GadgetInfo *);
 static void HandleCheckbuttons(struct GadgetInfo *);
 static void HandleControlButtons(struct GadgetInfo *);
@@ -784,11 +827,9 @@ static int undo_buffer_steps = 0;
 
 static int edit_mode;
 
-static int counter_xsize = DXSIZE + FONT2_XSIZE - 2 * ED_GADGET_DISTANCE;
+static int element_shift = 0;
 
-int element_shift = 0;
-
-int editor_el_boulderdash[] =
+static int editor_el_boulderdash[] =
 {
   EL_CHAR('B'),
   EL_CHAR('O'),
@@ -805,7 +846,7 @@ int editor_el_boulderdash[] =
   EL_CHAR('S'),
   EL_CHAR('H'),
 
-  EL_PLAYER1,
+  EL_PLAYER_1,
   EL_EMPTY,
   EL_SAND,
   EL_STEELWALL,
@@ -830,9 +871,9 @@ int editor_el_boulderdash[] =
   EL_BD_FIREFLY_DOWN,
   EL_EMPTY,
 };
-int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash);
+static int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash);
 
-int editor_el_emerald_mine[] =
+static int editor_el_emerald_mine[] =
 {
   EL_CHAR('E'),
   EL_CHAR('M'),
@@ -849,12 +890,12 @@ int editor_el_emerald_mine[] =
   EL_CHAR('N'),
   EL_CHAR('E'),
 
-  EL_PLAYER1,
-  EL_PLAYER2,
-  EL_PLAYER3,
-  EL_PLAYER4,
+  EL_PLAYER_1,
+  EL_PLAYER_2,
+  EL_PLAYER_3,
+  EL_PLAYER_4,
 
-  EL_PLAYER1,
+  EL_PLAYER_1,
   EL_EMPTY,
   EL_SAND,
   EL_ROCK,
@@ -894,14 +935,14 @@ int editor_el_emerald_mine[] =
   EL_SPACESHIP_DOWN,
   EL_INVISIBLE_WALL,
 
-  EL_ACIDPOOL_TOPLEFT,
+  EL_ACID_POOL_TOPLEFT,
   EL_ACID,
-  EL_ACIDPOOL_TOPRIGHT,
+  EL_ACID_POOL_TOPRIGHT,
   EL_EMPTY,
 
-  EL_ACIDPOOL_BOTTOMLEFT,
-  EL_ACIDPOOL_BOTTOM,
-  EL_ACIDPOOL_BOTTOMRIGHT,
+  EL_ACID_POOL_BOTTOMLEFT,
+  EL_ACID_POOL_BOTTOM,
+  EL_ACID_POOL_BOTTOMRIGHT,
   EL_EMPTY,
 
   EL_AMOEBA_DROP,
@@ -909,49 +950,49 @@ int editor_el_emerald_mine[] =
   EL_AMOEBA_WET,
   EL_AMOEBA_DRY,
 
-  EL_EM_KEY1_FILE,
-  EL_EM_KEY2_FILE,
-  EL_EM_KEY3_FILE,
-  EL_EM_KEY4_FILE,
+  EL_EM_KEY_1_FILE,
+  EL_EM_KEY_2_FILE,
+  EL_EM_KEY_3_FILE,
+  EL_EM_KEY_4_FILE,
 
-  EL_EM_GATE1,
-  EL_EM_GATE2,
-  EL_EM_GATE3,
-  EL_EM_GATE4,
+  EL_EM_GATE_1,
+  EL_EM_GATE_2,
+  EL_EM_GATE_3,
+  EL_EM_GATE_4,
 
-  EL_EM_GATE1_GRAY,
-  EL_EM_GATE2_GRAY,
-  EL_EM_GATE3_GRAY,
-  EL_EM_GATE4_GRAY,
+  EL_EM_GATE_1_GRAY,
+  EL_EM_GATE_2_GRAY,
+  EL_EM_GATE_3_GRAY,
+  EL_EM_GATE_4_GRAY,
 };
-int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
+static int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
 
-int editor_el_more[] =
+static int editor_el_more[] =
 {
   EL_CHAR('M'),
   EL_CHAR('O'),
   EL_CHAR('R'),
   EL_CHAR('E'),
 
-  EL_KEY1,
-  EL_KEY2,
-  EL_KEY3,
-  EL_KEY4,
+  EL_KEY_1,
+  EL_KEY_2,
+  EL_KEY_3,
+  EL_KEY_4,
 
-  EL_GATE1,
-  EL_GATE2,
-  EL_GATE3,
-  EL_GATE4,
+  EL_GATE_1,
+  EL_GATE_2,
+  EL_GATE_3,
+  EL_GATE_4,
 
-  EL_GATE1_GRAY,
-  EL_GATE2_GRAY,
-  EL_GATE3_GRAY,
-  EL_GATE4_GRAY,
+  EL_GATE_1_GRAY,
+  EL_GATE_2_GRAY,
+  EL_GATE_3_GRAY,
+  EL_GATE_4_GRAY,
 
-  EL_ARROW_BLUE_LEFT,
-  EL_ARROW_BLUE_RIGHT,
-  EL_ARROW_BLUE_UP,
-  EL_ARROW_BLUE_DOWN,
+  EL_ARROW_LEFT,
+  EL_ARROW_RIGHT,
+  EL_ARROW_UP,
+  EL_ARROW_DOWN,
 
   EL_AMOEBA_FULL,
   EL_EMERALD_YELLOW,
@@ -963,7 +1004,7 @@ int editor_el_more[] =
   EL_WALL_EMERALD_RED,
   EL_WALL_EMERALD_PURPLE,
 
-  EL_GAMEOFLIFE,
+  EL_GAME_OF_LIFE,
   EL_PACMAN_UP,
   EL_TIME_ORB_FULL,
   EL_TIME_ORB_EMPTY,
@@ -971,16 +1012,16 @@ int editor_el_more[] =
   EL_PACMAN_LEFT,
   EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_WALL_GROWING,
+  EL_EXPANDABLE_WALL,
 
   EL_BIOMAZE,
   EL_PACMAN_DOWN,
   EL_LAMP,
   EL_LAMP_ACTIVE,
 
-  EL_DYNABOMB_NR,
-  EL_DYNABOMB_SZ,
-  EL_DYNABOMB_XL,
+  EL_DYNABOMB_INCREASE_NUMBER,
+  EL_DYNABOMB_INCREASE_SIZE,
+  EL_DYNABOMB_INCREASE_POWER,
   EL_STONEBLOCK,
 
   EL_MOLE,
@@ -1001,36 +1042,36 @@ int editor_el_more[] =
   EL_EMPTY,
   EL_MOLE_DOWN,
   EL_BALLOON,
-  EL_BALLOON_SEND_ANY_DIRECTION,
+  EL_BALLOON_SWITCH_ANY,
 
-  EL_BALLOON_SEND_LEFT,
-  EL_BALLOON_SEND_RIGHT,
-  EL_BALLOON_SEND_UP,
-  EL_BALLOON_SEND_DOWN,
+  EL_BALLOON_SWITCH_LEFT,
+  EL_BALLOON_SWITCH_RIGHT,
+  EL_BALLOON_SWITCH_UP,
+  EL_BALLOON_SWITCH_DOWN,
 
   EL_SATELLITE,
-  EL_WALL_GROWING_X,
-  EL_WALL_GROWING_Y,
-  EL_WALL_GROWING_XY,
+  EL_EXPANDABLE_WALL_HORIZONTAL,
+  EL_EXPANDABLE_WALL_VERTICAL,
+  EL_EXPANDABLE_WALL_ANY,
 
   EL_INVISIBLE_STEELWALL,
   EL_INVISIBLE_WALL,
   EL_SPEED_PILL,
   EL_BLACK_ORB,
 
-  EL_EMC_STEELWALL1,
-  EL_EMC_WALL_PILLAR_UPPER,
-  EL_EMC_WALL_PILLAR_MIDDLE,
-  EL_EMC_WALL_PILLAR_LOWER,
+  EL_EMC_STEELWALL_1,
+  EL_EMC_WALL_1,
+  EL_EMC_WALL_2,
+  EL_EMC_WALL_3,
 
-  EL_EMC_WALL4,
-  EL_EMC_WALL5,
-  EL_EMC_WALL6,
-  EL_EMC_WALL7,
+  EL_EMC_WALL_4,
+  EL_EMC_WALL_5,
+  EL_EMC_WALL_6,
+  EL_EMC_WALL_7,
 };
-int num_editor_el_more = SIZEOF_ARRAY_INT(editor_el_more);
+static int num_editor_el_more = SIZEOF_ARRAY_INT(editor_el_more);
 
-int editor_el_sokoban[] =
+static int editor_el_sokoban[] =
 {
   EL_CHAR('S'),
   EL_CHAR('O'),
@@ -1047,9 +1088,9 @@ int editor_el_sokoban[] =
   EL_SOKOBAN_FIELD_FULL,
   EL_STEELWALL,
 };
-int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban);
+static int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban);
 
-int editor_el_supaplex[] =
+static int editor_el_supaplex[] =
 {
   EL_CHAR('S'),
   EL_CHAR('U'),
@@ -1068,52 +1109,52 @@ int editor_el_supaplex[] =
 
   EL_SP_INFOTRON,
   EL_SP_CHIP_SINGLE,
-  EL_SP_HARD_GRAY,
+  EL_SP_HARDWARE_GRAY,
   EL_SP_EXIT_CLOSED,
 
   EL_SP_DISK_ORANGE,
-  EL_SP_PORT1_RIGHT,
-  EL_SP_PORT1_DOWN,
-  EL_SP_PORT1_LEFT,
+  EL_SP_PORT_RIGHT,
+  EL_SP_PORT_DOWN,
+  EL_SP_PORT_LEFT,
 
-  EL_SP_PORT1_UP,
-  EL_SP_PORT2_RIGHT,
-  EL_SP_PORT2_DOWN,
-  EL_SP_PORT2_LEFT,
+  EL_SP_PORT_UP,
+  EL_SP_GRAVITY_PORT_RIGHT,
+  EL_SP_GRAVITY_PORT_DOWN,
+  EL_SP_GRAVITY_PORT_LEFT,
 
-  EL_SP_PORT2_UP,
+  EL_SP_GRAVITY_PORT_UP,
   EL_SP_SNIKSNAK,
   EL_SP_DISK_YELLOW,
   EL_SP_TERMINAL,
 
   EL_SP_DISK_RED,
-  EL_SP_PORT_Y,
-  EL_SP_PORT_X,
-  EL_SP_PORT_XY,
+  EL_SP_PORT_VERTICAL,
+  EL_SP_PORT_HORIZONTAL,
+  EL_SP_PORT_ANY,
 
   EL_SP_ELECTRON,
   EL_SP_BUGGY_BASE,
   EL_SP_CHIP_LEFT,
   EL_SP_CHIP_RIGHT,
 
-  EL_SP_HARD_BASE1,
-  EL_SP_HARD_GREEN,
-  EL_SP_HARD_BLUE,
-  EL_SP_HARD_RED,
+  EL_SP_HARDWARE_BASE_1,
+  EL_SP_HARDWARE_GREEN,
+  EL_SP_HARDWARE_BLUE,
+  EL_SP_HARDWARE_RED,
 
-  EL_SP_HARD_YELLOW,
-  EL_SP_HARD_BASE2,
-  EL_SP_HARD_BASE3,
-  EL_SP_HARD_BASE4,
+  EL_SP_HARDWARE_YELLOW,
+  EL_SP_HARDWARE_BASE_2,
+  EL_SP_HARDWARE_BASE_3,
+  EL_SP_HARDWARE_BASE_4,
 
-  EL_SP_HARD_BASE5,
-  EL_SP_HARD_BASE6,
-  EL_SP_CHIP_UPPER,
-  EL_SP_CHIP_LOWER,
+  EL_SP_HARDWARE_BASE_5,
+  EL_SP_HARDWARE_BASE_6,
+  EL_SP_CHIP_TOP,
+  EL_SP_CHIP_BOTTOM,
 };
-int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
+static int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
 
-int editor_el_diamond_caves[] =
+static int editor_el_diamond_caves[] =
 {
   EL_CHAR('D'),
   EL_CHAR('I'),
@@ -1140,35 +1181,35 @@ int editor_el_diamond_caves[] =
   EL_WALL_PEARL,
   EL_WALL_CRYSTAL,
 
-  EL_CONVEYOR_BELT1_LEFT,
-  EL_CONVEYOR_BELT1_MIDDLE,
-  EL_CONVEYOR_BELT1_RIGHT,
-  EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT_1_LEFT,
+  EL_CONVEYOR_BELT_1_MIDDLE,
+  EL_CONVEYOR_BELT_1_RIGHT,
+  EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
 
-  EL_CONVEYOR_BELT2_LEFT,
-  EL_CONVEYOR_BELT2_MIDDLE,
-  EL_CONVEYOR_BELT2_RIGHT,
-  EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT_2_LEFT,
+  EL_CONVEYOR_BELT_2_MIDDLE,
+  EL_CONVEYOR_BELT_2_RIGHT,
+  EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
 
-  EL_CONVEYOR_BELT3_LEFT,
-  EL_CONVEYOR_BELT3_MIDDLE,
-  EL_CONVEYOR_BELT3_RIGHT,
-  EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT_3_LEFT,
+  EL_CONVEYOR_BELT_3_MIDDLE,
+  EL_CONVEYOR_BELT_3_RIGHT,
+  EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
 
-  EL_CONVEYOR_BELT4_LEFT,
-  EL_CONVEYOR_BELT4_MIDDLE,
-  EL_CONVEYOR_BELT4_RIGHT,
-  EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT_4_LEFT,
+  EL_CONVEYOR_BELT_4_MIDDLE,
+  EL_CONVEYOR_BELT_4_RIGHT,
+  EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
 
-  EL_CONVEYOR_BELT1_SWITCH_LEFT,
-  EL_CONVEYOR_BELT2_SWITCH_LEFT,
-  EL_CONVEYOR_BELT3_SWITCH_LEFT,
-  EL_CONVEYOR_BELT4_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_4_SWITCH_LEFT,
 
-  EL_CONVEYOR_BELT1_SWITCH_RIGHT,
-  EL_CONVEYOR_BELT2_SWITCH_RIGHT,
-  EL_CONVEYOR_BELT3_SWITCH_RIGHT,
-  EL_CONVEYOR_BELT4_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
 
   EL_SWITCHGATE_OPEN,
   EL_SWITCHGATE_CLOSED,
@@ -1195,9 +1236,9 @@ int editor_el_diamond_caves[] =
   EL_EXTRA_TIME,
   EL_EMPTY,
 };
-int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves);
+static int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves);
 
-int editor_el_dx_boulderdash[] =
+static int editor_el_dx_boulderdash[] =
 {
   EL_CHAR('D'),
   EL_CHAR('X'),
@@ -1226,7 +1267,7 @@ int editor_el_dx_boulderdash[] =
 
   EL_TUBE_HORIZONTAL,
   EL_TUBE_VERTICAL_RIGHT,
-  EL_TUBE_ALL,
+  EL_TUBE_ANY,
   EL_TUBE_VERTICAL_LEFT,
 
   EL_TUBE_VERTICAL,
@@ -1239,9 +1280,9 @@ int editor_el_dx_boulderdash[] =
   EL_EMPTY,
   EL_EMPTY
 };
-int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash);
+static int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash);
 
-int editor_el_chars[] =
+static int editor_el_chars[] =
 {
   EL_CHAR('T'),
   EL_CHAR('E'),
@@ -1333,9 +1374,9 @@ int editor_el_chars[] =
   EL_CHAR('´'),
   EL_CHAR('|')
 };
-int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars);
+static int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars);
 
-int editor_el_custom[] =
+static int editor_el_custom[] =
 {
   EL_CHAR('C'),
   EL_CHAR('U'),
@@ -1517,12 +1558,12 @@ int editor_el_custom[] =
   EL_CUSTOM_START + 126,
   EL_CUSTOM_START + 127
 };
-int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom);
+static int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom);
 
-int *editor_elements = NULL;   /* dynamically allocated */
-int num_editor_elements = 0;   /* dynamically determined */
+static int *editor_elements = NULL;    /* dynamically allocated */
+static int num_editor_elements = 0;    /* dynamically determined */
 
-struct
+static struct
 {
   boolean *setup_value;
   int *element_list;
@@ -1612,6 +1653,16 @@ static void ReinitializeElementListButtons()
   initialization_needed = FALSE;
 }
 
+static int getCounterGadgetWidth()
+{
+  return (DXSIZE + getFontWidth(FONT_INPUT) - 2 * ED_GADGET_DISTANCE);
+}
+
+static int getMaxInfoTextLength()
+{
+  return (SXSIZE / getFontWidth(FONT_TEXT_2));
+}
+
 static char *getElementInfoText(int element)
 {
   char *info_text = NULL;
@@ -1877,6 +1928,7 @@ static void CreateControlButtons()
 
 static void CreateCounterButtons()
 {
+  int max_infotext_len = getMaxInfoTextLength();
   int i;
 
   for (i=0; i<ED_NUM_COUNTERBUTTONS; i++)
@@ -1896,7 +1948,7 @@ static void CreateCounterButtons()
       int gd_x, gd_x1, gd_x2, gd_y;
       int x_size, y_size;
       unsigned long event_mask;
-      char infotext[MAX_INFOTEXT_LEN + 1];
+      char infotext[max_infotext_len + 1];
 
       event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
@@ -1955,7 +2007,7 @@ static void CreateCounterButtons()
 
       if (j == 0)
       {
-       int font_type = FC_YELLOW;
+       int font_type = FONT_INPUT;
        int gd_width = ED_WIN_COUNT_XSIZE;
 
        id = counterbutton_info[i].gadget_id_text;
@@ -1963,7 +2015,7 @@ static void CreateCounterButtons()
 
        if (i == ED_COUNTER_ID_SELECT_LEVEL)
        {
-         font_type = FC_SPECIAL3;
+         font_type = FONT_LEVEL_NUMBER;
 
          xpos += 2 * ED_GADGET_DISTANCE;
          ypos -= ED_GADGET_DISTANCE;
@@ -2105,6 +2157,7 @@ static void CreateDrawingAreas()
 
 static void CreateTextInputGadgets()
 {
+  int max_infotext_len = getMaxInfoTextLength();
   int i;
 
   for (i=0; i<ED_NUM_TEXTINPUT; i++)
@@ -2113,7 +2166,7 @@ static void CreateTextInputGadgets()
     int gd_x, gd_y;
     struct GadgetInfo *gi;
     unsigned long event_mask;
-    char infotext[1024];
+    char infotext[MAX_OUTPUT_LINESIZE + 1];
     int id = textinput_info[i].gadget_id;
 
     event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
@@ -2122,7 +2175,7 @@ static void CreateTextInputGadgets()
     gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
 
     sprintf(infotext, "Enter %s", textinput_info[i].infotext);
-    infotext[MAX_INFOTEXT_LEN] = '\0';
+    infotext[max_infotext_len] = '\0';
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_CUSTOM_TYPE_ID, i,
@@ -2132,7 +2185,7 @@ static void CreateTextInputGadgets()
                      GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
                      GDI_TEXT_VALUE, textinput_info[i].value,
                      GDI_TEXT_SIZE, textinput_info[i].size,
-                     GDI_TEXT_FONT, FC_YELLOW,
+                     GDI_TEXT_FONT, FONT_INPUT,
                      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
                      GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
                      GDI_BORDER_SIZE, ED_BORDER_SIZE,
@@ -2149,6 +2202,55 @@ static void CreateTextInputGadgets()
   }
 }
 
+static void CreateSelectboxGadgets()
+{
+  int max_infotext_len = getMaxInfoTextLength();
+  int i;
+
+  for (i=0; i<ED_NUM_SELECTBOX; i++)
+  {
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+    int gd_x, gd_y;
+    struct GadgetInfo *gi;
+    unsigned long event_mask;
+    char infotext[MAX_OUTPUT_LINESIZE + 1];
+    int id = selectbox_info[i].gadget_id;
+
+    event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+    gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
+    gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
+
+    sprintf(infotext, "Select %s", selectbox_info[i].infotext);
+    infotext[max_infotext_len] = '\0';
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_CUSTOM_TYPE_ID, i,
+                     GDI_INFO_TEXT, infotext,
+                     GDI_X, SX + selectbox_info[i].x,
+                     GDI_Y, SY + selectbox_info[i].y,
+                     GDI_TYPE, GD_TYPE_SELECTBOX,
+                     GDI_SELECTBOX_VALUES, selectbox_info[i].values,
+                     GDI_SELECTBOX_INDEX, selectbox_info[i].index,
+                     GDI_TEXT_SIZE, selectbox_info[i].size,
+                     GDI_TEXT_FONT, FONT_INPUT,
+                     GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+                     GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+                     GDI_BORDER_SIZE, ED_BORDER_SIZE,
+                     GDI_BORDER_SIZE_SELECTBUTTON, getFontHeight(FONT_INPUT),
+                     GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
+                     GDI_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+                     GDI_CALLBACK_ACTION, HandleSelectboxGadgets,
+                     GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+}
+
 static void CreateScrollbarGadgets()
 {
   int i;
@@ -2310,6 +2412,7 @@ void CreateLevelEditorGadgets()
   CreateCounterButtons();
   CreateDrawingAreas();
   CreateTextInputGadgets();
+  CreateSelectboxGadgets();
   CreateScrollbarGadgets();
   CreateCheckbuttonGadgets();
 }
@@ -2364,6 +2467,11 @@ static void MapTextInputGadget(int id)
   MapGadget(level_editor_gadget[textinput_info[id].gadget_id]);
 }
 
+static void MapSelectboxGadget(int id)
+{
+  MapGadget(level_editor_gadget[selectbox_info[id].gadget_id]);
+}
+
 static void MapRadiobuttonGadget(int id)
 {
   MapGadget(level_editor_gadget[radiobutton_info[id].gadget_id]);
@@ -2464,7 +2572,7 @@ static boolean LevelContainsPlayer()
 
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
-      if (Feld[x][y] == EL_PLAYER1 ||
+      if (Feld[x][y] == EL_PLAYER_1 ||
          Feld[x][y] == EL_SP_MURPHY) 
        player_found = TRUE;
 
@@ -2600,16 +2708,7 @@ void DrawLevelEd()
 
   DrawEditModeWindow();
 
-  /*
-  FadeToFront();
-  */
-
-
   OpenDoor(DOOR_OPEN_1);
-
-  /*
-  OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
-  */
 }
 
 static void AdjustDrawingAreaGadgets()
@@ -2791,7 +2890,7 @@ static void DrawDrawingWindow()
 
 static void DrawElementBorder(int dest_x, int dest_y, int width, int height)
 {
-  int border_graphic = IMG_SAND;
+  int border_graphic = IMG_EDITOR_ELEMENT_BORDER;
   Bitmap *src_bitmap;
   int src_x, src_y;
   int num_mini_tilex = width / MINI_TILEX + 1;
@@ -2826,24 +2925,24 @@ static void DrawRandomPlacementBackgroundArea()
 
 static void DrawLevelInfoWindow()
 {
-  char infotext[1024];
+  char infotext[MAX_OUTPUT_LINESIZE + 1];
+  int max_infotext_len = getMaxInfoTextLength();
   int xoffset_above = 0;
   int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE);
-  int xoffset_right = counter_xsize;
+  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 font_color = FC_GREEN;
   int i, x, y;
 
-  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_LEVEL);
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
   DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
-          "Level Settings", FS_BIG, FC_YELLOW);
+          "Level Settings", FONT_TITLE_1);
   DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
-          "Editor Settings", FS_BIG, FC_YELLOW);
+          "Editor Settings", FONT_TITLE_1);
 
   /* draw counter gadgets */
   for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++)
@@ -2854,8 +2953,8 @@ static void DrawLevelInfoWindow()
       y = counterbutton_info[i].y + yoffset_above;
 
       sprintf(infotext, "%s:", counterbutton_info[i].infotext_above);
-      infotext[MAX_INFOTEXT_LEN] = '\0';
-      DrawTextF(x, y, font_color, infotext);
+      infotext[max_infotext_len] = '\0';
+      DrawTextF(x, y, FONT_TEXT_1, infotext);
     }
 
     if (counterbutton_info[i].infotext_right)
@@ -2864,8 +2963,8 @@ static void DrawLevelInfoWindow()
       y = counterbutton_info[i].y + yoffset_right;
 
       sprintf(infotext, "%s", counterbutton_info[i].infotext_right);
-      infotext[MAX_INFOTEXT_LEN] = '\0';
-      DrawTextF(x, y, font_color, infotext);
+      infotext[max_infotext_len] = '\0';
+      DrawTextF(x, y, FONT_TEXT_1, infotext);
     }
 
     ModifyEditorCounter(i, *counterbutton_info[i].value);
@@ -2879,9 +2978,9 @@ static void DrawLevelInfoWindow()
     y = textinput_info[i].y + yoffset_above;
 
     sprintf(infotext, "%s:", textinput_info[i].infotext);
-    infotext[MAX_INFOTEXT_LEN] = '\0';
+    infotext[max_infotext_len] = '\0';
 
-    DrawTextF(x, y, font_color, infotext);
+    DrawTextF(x, y, FONT_TEXT_1, infotext);
     ModifyEditorTextInput(i, textinput_info[i].value);
     MapTextInputGadget(i);
   }
@@ -2895,7 +2994,7 @@ static void DrawLevelInfoWindow()
     x = radiobutton_info[i].x + xoffset_right2;
     y = radiobutton_info[i].y + yoffset_right2;
 
-    DrawTextF(x, y, font_color, radiobutton_info[i].text);
+    DrawTextF(x, y, FONT_TEXT_1, radiobutton_info[i].text);
     ModifyGadget(level_editor_gadget[radiobutton_info[i].gadget_id],
                 GDI_CHECKED, checked, GDI_END);
     MapRadiobuttonGadget(i);
@@ -2907,7 +3006,7 @@ static void DrawLevelInfoWindow()
     x = checkbutton_info[i].x + xoffset_right2;
     y = checkbutton_info[i].y + yoffset_right2;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -2923,15 +3022,13 @@ static void DrawAmoebaContentArea()
   int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
-  int font_color = FC_GREEN;
 
   ElementContent[0][0][0] = level.amoeba_content;
 
   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);
+  DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", FONT_TEXT_1);
 
   MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
 }
@@ -2943,9 +3040,8 @@ static void DrawElementContentAreas()
   int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
-  int xoffset_right = counter_xsize;
+  int xoffset_right = getCounterGadgetWidth();
   int yoffset_right = ED_BORDER_SIZE;
-  int font_color = FC_GREEN;
   int i, x, y;
 
   for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
@@ -2959,7 +3055,7 @@ static void DrawElementContentAreas()
   /* display counter to choose number of element content areas */
   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");
+  DrawTextF(x, y, FONT_TEXT_1, "number of content areas");
 
   ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
   MapCounterButtons(counter_id);
@@ -2973,11 +3069,11 @@ static void DrawElementContentAreas()
                      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);
+          "Content", FONT_TEXT_1);
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 1 * MINI_TILEY + 1,
-          "when", FS_SMALL, font_color);
+          "when",    FONT_TEXT_1);
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
-          "smashed", FS_SMALL, font_color);
+          "smashed", FONT_TEXT_1);
 
   for (i=0; i<level.num_yam_contents; i++)
   {
@@ -2988,7 +3084,7 @@ static void DrawElementContentAreas()
 
     DrawTextF(area_sx - SX + 5 * (i % 4) * MINI_TILEX + MINI_TILEX + 1,
              area_sy - SY + 6 * (i / 4) * MINI_TILEY + 4 * MINI_TILEY - 4,
-             font_color, "%d", i + 1);
+             FONT_TEXT_1, "%d", i + 1);
   }
 
   for (i=0; i<level.num_yam_contents; i++)
@@ -3006,13 +3102,12 @@ static void DrawPropertiesWindow()
   int counter_id = ED_COUNTER_ID_ELEM_SCORE;
   int num_elements_in_level;
   float percentage;
-  int xoffset_right = counter_xsize;
+  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 font_color = FC_GREEN;
   int i, x, y;
   static struct
   {
@@ -3052,14 +3147,14 @@ static void DrawPropertiesWindow()
     { 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_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_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 },
@@ -3069,12 +3164,12 @@ static void DrawPropertiesWindow()
     { -1, NULL, NULL }
   };
 
-  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_ELEMENT);
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
   DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
-          "Element Settings", FS_BIG, FC_YELLOW);
+          "Element Settings", FONT_TITLE_1);
 
   DrawElementBorder(SX + xstart * MINI_TILEX,
                    SY + ystart * MINI_TILEY + MINI_TILEY / 2,
@@ -3087,7 +3182,7 @@ static void DrawPropertiesWindow()
   FrameCounter = 0;    /* restart animation frame counter */
 
   DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
-           font_color, getElementInfoText(properties_element));
+           FONT_TEXT_1, getElementInfoText(properties_element));
 
   num_elements_in_level = 0;
   for (y=0; y<lev_fieldy; y++) 
@@ -3096,9 +3191,10 @@ static void DrawPropertiesWindow()
        num_elements_in_level++;
   percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
 
-  DrawTextF(ED_SETTINGS_XPOS, 5 * TILEY, font_color, "In this level:");
-  DrawTextF(ED_SETTINGS_XPOS + 15 * FONT2_XSIZE, 5 * TILEY, FC_YELLOW,
-           "%d (%.2f%%)", num_elements_in_level, percentage);
+  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++)
@@ -3109,7 +3205,7 @@ static void DrawPropertiesWindow()
       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);
+      DrawTextF(x, y, FONT_TEXT_1, elements_with_counter[i].text);
 
       ModifyEditorCounter(counter_id,  *counterbutton_info[counter_id].value);
       MapCounterButtons(counter_id);
@@ -3124,7 +3220,7 @@ static void DrawPropertiesWindow()
     x = checkbutton_info[i].x + xoffset_right2;
     y = checkbutton_info[i].y + yoffset_right2;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -3142,7 +3238,7 @@ static void DrawPropertiesWindow()
     x = checkbutton_info[i].x + xoffset_right2;
     y = checkbutton_info[i].y + yoffset_right2;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -3161,7 +3257,7 @@ static void DrawPropertiesWindow()
 
     checkbutton_info[i].value = &custom_element_properties[nr].indestructible;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -3173,7 +3269,7 @@ static void DrawPropertiesWindow()
 
     checkbutton_info[i].value = &custom_element_properties[nr].can_fall;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -3185,7 +3281,7 @@ static void DrawPropertiesWindow()
 
     checkbutton_info[i].value = &custom_element_properties[nr].can_smash;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -3197,7 +3293,7 @@ static void DrawPropertiesWindow()
 
     checkbutton_info[i].value = &custom_element_properties[nr].pushable;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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);
@@ -3209,10 +3305,22 @@ static void DrawPropertiesWindow()
 
     checkbutton_info[i].value = &custom_element_properties[nr].slippery;
 
-    DrawTextF(x, y, font_color, checkbutton_info[i].text);
+    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 selectbox gadget */
+    i = ED_SELECTBOX_ID_TEST;
+    x = selectbox_info[i].x + xoffset_right2;
+    y = selectbox_info[i].y + yoffset_right2;
+
+    selectbox_info[i].index = &test_index;
+
+    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);
   }
 }
 
@@ -3908,14 +4016,14 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
        }
        else if (new_element != Feld[lx][ly])
        {
-         if (new_element == EL_PLAYER1)
+         if (new_element == EL_PLAYER_1)
          {
            /* remove player at old position */
            for(y=0; y<lev_fieldy; y++)
            {
              for(x=0; x<lev_fieldx; x++)
              {
-               if (Feld[x][y] == EL_PLAYER1)
+               if (Feld[x][y] == EL_PLAYER_1)
                {
                  Feld[x][y] = EL_EMPTY;
                  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
@@ -4117,6 +4225,16 @@ static void HandleTextInputGadgets(struct GadgetInfo *gi)
   strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
 }
 
+static void HandleSelectboxGadgets(struct GadgetInfo *gi)
+{
+  *selectbox_info[gi->custom_type_id].index = gi->selectbox.index;
+
+#if 1
+  printf("Selected text value: '%s'\n",
+        selectbox_info[gi->custom_type_id].values[gi->selectbox.index]);
+#endif
+}
+
 static void HandleRadiobuttons(struct GadgetInfo *gi)
 {
   *radiobutton_info[gi->custom_type_id].value =
@@ -4554,8 +4672,9 @@ void ClearEditorGadgetInfoText()
 void HandleEditorGadgetInfoText(void *ptr)
 {
   struct GadgetInfo *gi = (struct GadgetInfo *)ptr;
-  char infotext[MAX_INFOTEXT_LEN + 1];
-  char shortcut[MAX_INFOTEXT_LEN + 1];
+  char infotext[MAX_OUTPUT_LINESIZE + 1];
+  char shortcut[MAX_OUTPUT_LINESIZE + 1];
+  int max_infotext_len = getMaxInfoTextLength();
 
   if (game_status != LEVELED)
     return;
@@ -4572,8 +4691,8 @@ void HandleEditorGadgetInfoText(void *ptr)
   if (gi == NULL || gi->info_text == NULL)
     return;
 
-  strncpy(infotext, gi->info_text, MAX_INFOTEXT_LEN);
-  infotext[MAX_INFOTEXT_LEN] = '\0';
+  strncpy(infotext, gi->info_text, max_infotext_len);
+  infotext[max_infotext_len] = '\0';
 
   if (gi->custom_id < ED_NUM_CTRL_BUTTONS)
   {
@@ -4589,12 +4708,12 @@ void HandleEditorGadgetInfoText(void *ptr)
        sprintf(shortcut, " ('%s%c')",
                (key >= 'A' && key <= 'Z' ? "Shift-" : ""), key);
 
-      if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
+      if (strlen(infotext) + strlen(shortcut) <= max_infotext_len)
        strcat(infotext, shortcut);
     }
   }
 
-  DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FS_SMALL, FC_YELLOW);
+  DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FONT_TEXT_2);
 }
 
 static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
@@ -4688,18 +4807,18 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
        }
 
        if (drawing_function == GADGET_ID_PICK_ELEMENT)
-         DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+         DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                    "%s: %d, %d", infotext, lx, ly);
        else
-         DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+         DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                    "%s: %d, %d", infotext,
                    ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1);
       }
       else if (drawing_function == GADGET_ID_PICK_ELEMENT)
-       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                  "%s", getElementInfoText(Feld[lx][ly]));
       else
-       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+       DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
                  "Level position: %d, %d", lx, ly);
     }
 
@@ -4713,13 +4832,13 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
     }
   }
   else if (id == GADGET_ID_AMOEBA_CONTENT)
-    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
              "Amoeba content");
   else if (id == GADGET_ID_RANDOM_BACKGROUND)
-    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
              "Random placement background");
   else
-    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
              "Content area %d position: %d, %d",
              id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy);
 }