cleanup of BD style game elements in level editor

[rocksndiamonds.git] / src / editor.c

diff --git a/src/editor.c b/src/editor.c
index 6e24056011ad3e6ccc4e2e3f0a50fbf25dd87e90..14c5d86c88accd68a93fa004846995767b35e066 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -4613,7 +4613,7 @@ static int editor_el_boulderdash_native[] =
 
   EL_BD_STEELWALL,
   EL_BD_WALL,
-  EL_EMPTY,
+  EL_BD_SAND_2,
   EL_BD_MAGIC_WALL,
 
   EL_BD_AMOEBA,
@@ -4634,34 +4634,34 @@ static int editor_el_boulderdash_native[] =
   EL_BD_AMOEBA_2,
   EL_BD_BUTTERFLY_2_UP,
   EL_BD_FIREFLY_2_UP,
-  EL_EMPTY,
+  EL_BD_SLIME,
 
   EL_BD_BUTTERFLY_2_LEFT,
   EL_BD_FIREFLY_2_LEFT,
   EL_BD_BUTTERFLY_2_RIGHT,
   EL_BD_FIREFLY_2_RIGHT,
 
-  EL_EMPTY,
+  EL_BD_BOMB,
   EL_BD_BUTTERFLY_2_DOWN,
   EL_BD_FIREFLY_2_DOWN,
-  EL_EMPTY,
+  EL_BD_FLYING_DIAMOND,
 
-  EL_EMPTY,
+  EL_BD_NITRO_PACK,
   EL_BD_DRAGONFLY_UP,
   EL_BD_STONEFLY_UP,
-  EL_EMPTY,
+  EL_BD_DIAMOND_GLUED,
 
   EL_BD_DRAGONFLY_LEFT,
   EL_BD_STONEFLY_LEFT,
   EL_BD_DRAGONFLY_RIGHT,
   EL_BD_STONEFLY_RIGHT,
 
-  EL_EMPTY,
+  EL_BD_NUT,
   EL_BD_DRAGONFLY_DOWN,
   EL_BD_STONEFLY_DOWN,
   EL_EMPTY,
 
-  EL_EMPTY,
+  EL_BD_BITER_SWITCH_1,
   EL_BD_BITER_UP,
   EL_BD_COW_UP,
   EL_EMPTY,
@@ -4671,15 +4671,15 @@ static int editor_el_boulderdash_native[] =
   EL_BD_BITER_RIGHT,
   EL_BD_COW_RIGHT,
 
-  EL_EMPTY,
+  EL_BD_VOODOO_DOLL,
   EL_BD_BITER_DOWN,
   EL_BD_COW_DOWN,
-  EL_EMPTY,
+  EL_BD_GHOST,
 
-  EL_EMPTY,
-  EL_BD_SAND,
+  EL_BD_SAND_GLUED,
   EL_BD_SAND_BALL,
   EL_BD_SAND_LOOSE,
+  EL_BD_WALL_NON_SLOPED,
 
   EL_BD_SAND_SLOPED_UP_LEFT,
   EL_BD_SAND_SLOPED_UP_RIGHT,
@@ -4691,100 +4691,75 @@ static int editor_el_boulderdash_native[] =
   EL_BD_WALL_SLOPED_DOWN_LEFT,
   EL_BD_WALL_SLOPED_DOWN_RIGHT,
 
-  EL_BD_FLYING_DIAMOND,
   EL_BD_FLYING_ROCK,
+  EL_BD_ROCK_GLUED,
   EL_BD_STEELWALL_SLOPED_UP_LEFT,
   EL_BD_STEELWALL_SLOPED_UP_RIGHT,
 
-  EL_BD_NUT,
-  EL_BD_MEGA_ROCK,
+  EL_BD_WAITING_ROCK,
+  EL_BD_CHASING_ROCK,
   EL_BD_STEELWALL_SLOPED_DOWN_LEFT,
   EL_BD_STEELWALL_SLOPED_DOWN_RIGHT,
 
-  EL_BD_SAND_2,
-  EL_BD_WALL_NON_SLOPED,
-  EL_BD_WALL,
-  EL_BD_MAGIC_WALL,
-
-  EL_BD_EXIT_CLOSED,
-  EL_BD_EXIT_OPEN,
+  EL_BD_MEGA_ROCK,
+  EL_BD_SWEET,
   EL_BD_INVISIBLE_EXIT_CLOSED,
   EL_BD_INVISIBLE_EXIT_OPEN,
 
-  EL_BD_STEELWALL,
   EL_BD_STEELWALL_EXPLODABLE,
   EL_BD_STEELWALL_DIGGABLE,
   EL_BD_WALL_DIGGABLE,
+  EL_BD_FALLING_WALL,
 
   EL_BD_EXPANDABLE_WALL_HORIZONTAL,
   EL_BD_EXPANDABLE_WALL_VERTICAL,
   EL_BD_EXPANDABLE_WALL_ANY,
-  EL_BD_CREATURE_SWITCH,
+  EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL,
 
   EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL,
   EL_BD_EXPANDABLE_STEELWALL_VERTICAL,
   EL_BD_EXPANDABLE_STEELWALL_ANY,
-  EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL,
+  EL_BD_CREATURE_SWITCH,
 
-  EL_BD_BITER_SWITCH_1,
+  EL_BD_BLADDER,
+  EL_BD_BLADDER_SPENDER,
+  EL_BD_REPLICATOR,
   EL_BD_REPLICATOR_SWITCH,
+
+  EL_BD_CONVEYOR_LEFT,
+  EL_BD_CONVEYOR_RIGHT,
   EL_BD_CONVEYOR_SWITCH,
   EL_BD_CONVEYOR_DIR_SWITCH_RIGHT,
 
-  EL_BD_ACID,
-  EL_BD_FALLING_WALL,
-  EL_BD_BOX,
+  EL_BD_CLOCK,
   EL_BD_TIME_PENALTY,
-
   EL_BD_GRAVESTONE,
-  EL_BD_ROCK_GLUED,
-  EL_BD_DIAMOND_GLUED,
-  EL_BD_DIAMOND_KEY,
+  EL_BD_SKELETON,
 
-  EL_BD_TRAPPED_DIAMOND,
-  EL_BD_CLOCK,
-  EL_BD_SAND_GLUED,
   EL_BD_WATER,
+  EL_BD_ACID,
+  EL_BD_LAVA,
+  EL_BD_BOX,
+
+  EL_BD_GATE_1,
+  EL_BD_GATE_2,
+  EL_BD_GATE_3,
+  EL_BD_TRAPPED_DIAMOND,
 
   EL_BD_KEY_1,
   EL_BD_KEY_2,
   EL_BD_KEY_3,
-  EL_EMPTY,
+  EL_BD_DIAMOND_KEY,
 
   EL_BD_WALL_KEY_1,
   EL_BD_WALL_KEY_2,
   EL_BD_WALL_KEY_3,
   EL_BD_WALL_DIAMOND,
 
-  EL_BD_GATE_1,
-  EL_BD_GATE_2,
-  EL_BD_GATE_3,
-  EL_BD_POT,
-
   EL_BD_GRAVITY_SWITCH,
   EL_BD_PNEUMATIC_HAMMER,
   EL_BD_TELEPORTER,
-  EL_BD_SKELETON,
-
-  EL_BD_AMOEBA,
-  EL_BD_AMOEBA_2,
-  EL_BD_REPLICATOR,
-  EL_BD_BLADDER_SPENDER,
-
-  EL_BD_CONVEYOR_LEFT,
-  EL_BD_CONVEYOR_RIGHT,
-  EL_BD_BOMB,
-  EL_BD_NITRO_PACK,
-
-  EL_BD_LAVA,
-  EL_BD_SWEET,
-  EL_BD_VOODOO_DOLL,
-  EL_BD_SLIME,
-
-  EL_BD_BLADDER,
-  EL_BD_WAITING_ROCK,
-  EL_BD_CHASING_ROCK,
-  EL_BD_GHOST,
+  EL_BD_POT,
 
   EL_BD_PLAYER,
   EL_BD_PLAYER_WITH_BOMB,
@@ -6406,7 +6381,7 @@ static int getTextWidthForDrawingArea(char *text)
   if (text == NULL)
     return 0;
 
-  return (getTextWidth(text, FONT_TEXT_1) + ED_DRAWINGAREA_TEXT_DISTANCE);
+  return (getTextWidth(text, FONT_TEXT_1) + ED_DRAWINGAREA_BORDER_SIZE);
 }
 
 static int getRightGadgetBorder(struct GadgetInfo *gi, char *text)
@@ -8250,9 +8225,12 @@ static void MapCounterButtons(int id)
   ModifyEditorCounterValue(id, *counterbutton_info[id].value);
 
   // set position for counter gadgets with dynamically determined position
-  ModifyGadget(gi_down, GDI_Y, SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
-  ModifyGadget(gi_text, GDI_Y, SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
-  ModifyGadget(gi_up,   GDI_Y, SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
+  if (id != ED_COUNTER_ID_SELECT_LEVEL)
+  {
+    ModifyGadget(gi_down, GDI_Y, SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
+    ModifyGadget(gi_text, GDI_Y, SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
+    ModifyGadget(gi_up,   GDI_Y, SY + ED_SETTINGS_Y(counterbutton_info[id].y), GDI_END);
+  }
 
   // vertical position might have changed after setting position above
   y = gi_up->y + yoffset;
@@ -8310,7 +8288,7 @@ static void MapDrawingArea(int id)
   int area_ysize = gi->drawing.area_ysize;
   int xoffset_left = getTextWidthForDrawingArea(drawingarea_info[id].text_left);
   int xoffset_below = getTextWidth(drawingarea_info[id].text_below, font_nr);
-  int x_left  = gi->x - xoffset_left;
+  int x_left  = gi->x - xoffset_left - ED_DRAWINGAREA_BORDER_SIZE;
   int x_right = gi->x + gi->width + ED_DRAWINGAREA_TEXT_DISTANCE;
   int x_above = gi->x - ED_DRAWINGAREA_BORDER_SIZE;
   int x_below = gi->x + (gi->width - xoffset_below) / 2;