cleanup of BD engine game elements palette in editor

diff --git a/src/editor.c b/src/editor.c
index fa797d1ebfe04078b13539f33b1edcdce53c7499..3008be7a2c7744667056df42e8e61651931efb64 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -5548,12 +5548,12 @@ static int editor_el_boulderdash_native[] =
   EL_BDX_NUT,
   EL_BDX_DRAGONFLY_DOWN,
   EL_BDX_STONEFLY_DOWN,
-  EL_EMPTY,
+  EL_BDX_PLAYER_GLUED,
 
   EL_BDX_BITER_SWITCH_1,
   EL_BDX_BITER_UP,
   EL_BDX_COW_UP,
-  EL_EMPTY,
+  EL_BDX_ROCKET_LAUNCHER,
 
   EL_BDX_BITER_LEFT,
   EL_BDX_COW_LEFT,
@@ -5621,7 +5621,7 @@ static int editor_el_boulderdash_native[] =
   EL_BDX_CONVEYOR_DIR_SWITCH,
 
   EL_BDX_CLOCK,
-  EL_BDX_TIME_PENALTY,
+  EL_EMPTY,
   EL_BDX_GRAVESTONE,
   EL_BDX_SKELETON,
 
@@ -5649,16 +5649,6 @@ static int editor_el_boulderdash_native[] =
   EL_BDX_GRAVITY_SWITCH,
   EL_BDX_PNEUMATIC_HAMMER,
   EL_BDX_TELEPORTER,
-
-  EL_BDX_PLAYER,
-  EL_BDX_PLAYER_WITH_BOMB,
-  EL_BDX_PLAYER_WITH_ROCKET_LAUNCHER,
-  EL_BDX_ROCKET_LAUNCHER,
-
-  EL_BDX_PLAYER_GLUED,
-  EL_BDX_PLAYER_STIRRING,
-  EL_EMPTY,
-  EL_EMPTY,
 };
 static int *editor_hl_boulderdash_native_ptr = editor_hl_boulderdash_native;
 static int *editor_el_boulderdash_native_ptr = editor_el_boulderdash_native;
@@ -5685,15 +5675,20 @@ static int editor_el_boulderdash_effects[] =
   EL_BDX_NUT_FALLING,
   EL_BDX_FLYING_ROCK_FLYING,
 
+  EL_BDX_SAND_BALL_FALLING,
+  EL_BDX_SAND_LOOSE_FALLING,
+  EL_EMPTY,
+  EL_EMPTY,
+
   EL_BDX_PLAYER_GROWING_1,
   EL_BDX_PLAYER_GROWING_2,
   EL_BDX_PLAYER_GROWING_3,
   EL_BDX_PLAYER,
 
   EL_BDX_PLAYER_WITH_BOMB,
+  EL_BDX_PLAYER_WITH_ROCKET_LAUNCHER,
   EL_BDX_PLAYER_STIRRING,
-  EL_BDX_EXIT_OPEN,
-  EL_BDX_INVISIBLE_EXIT_OPEN,
+  EL_EMPTY,
 
   EL_BDX_BUBBLE_1,
   EL_BDX_BUBBLE_2,
@@ -5705,15 +5700,15 @@ static int editor_el_boulderdash_effects[] =
   EL_BDX_BUBBLE_7,
   EL_BDX_BUBBLE_8,
 
-  EL_BDX_SAND_2,
   EL_BDX_COW_ENCLOSED_1,
   EL_BDX_COW_ENCLOSED_2,
   EL_BDX_COW_ENCLOSED_3,
-
   EL_BDX_COW_ENCLOSED_4,
+
   EL_BDX_COW_ENCLOSED_5,
   EL_BDX_COW_ENCLOSED_6,
   EL_BDX_COW_ENCLOSED_7,
+  EL_EMPTY,
 
   EL_BDX_WATER_1,
   EL_BDX_WATER_2,
@@ -5775,6 +5770,11 @@ static int editor_el_boulderdash_effects[] =
   EL_BDX_NITRO_PACK_EXPLODING_3,
   EL_BDX_NITRO_PACK_EXPLODING_4,
 
+  EL_BDX_AMOEBA_2_EXPLODING_1,
+  EL_BDX_AMOEBA_2_EXPLODING_2,
+  EL_BDX_AMOEBA_2_EXPLODING_3,
+  EL_BDX_AMOEBA_2_EXPLODING_4,
+
   EL_BDX_ROCK_GROWING_1,
   EL_BDX_ROCK_GROWING_2,
   EL_BDX_ROCK_GROWING_3,
@@ -5794,6 +5794,11 @@ static int editor_el_boulderdash_effects[] =
   EL_BDX_GHOST_EXPLODING_2,
   EL_BDX_GHOST_EXPLODING_3,
   EL_BDX_GHOST_EXPLODING_4,
+
+  EL_BDX_ROCKET_RIGHT,
+  EL_BDX_ROCKET_UP,
+  EL_BDX_ROCKET_LEFT,
+  EL_BDX_ROCKET_DOWN,
 };
 static int *editor_hl_boulderdash_effects_ptr = editor_hl_boulderdash_effects;
 static int *editor_el_boulderdash_effects_ptr = editor_el_boulderdash_effects;
@@ -5814,83 +5819,121 @@ static int editor_el_boulderdash_scanned[] =
   EL_BDX_SAND_BALL_FALLING_SCANNED,
   EL_BDX_SAND_LOOSE_SCANNED,
   EL_BDX_SAND_LOOSE_FALLING_SCANNED,
+
   EL_BDX_ROCK_SCANNED,
   EL_BDX_ROCK_FALLING_SCANNED,
   EL_BDX_FLYING_ROCK_SCANNED,
   EL_BDX_FLYING_ROCK_FLYING_SCANNED,
+
   EL_BDX_MEGA_ROCK_SCANNED,
   EL_BDX_MEGA_ROCK_FALLING_SCANNED,
   EL_BDX_DIAMOND_SCANNED,
   EL_BDX_DIAMOND_FALLING_SCANNED,
+
   EL_BDX_FLYING_DIAMOND_SCANNED,
   EL_BDX_FLYING_DIAMOND_FLYING_SCANNED,
   EL_BDX_NUT_SCANNED,
   EL_BDX_NUT_FALLING_SCANNED,
+
   EL_BDX_EXPANDABLE_WALL_HORIZONTAL_SCANNED,
   EL_BDX_EXPANDABLE_WALL_VERTICAL_SCANNED,
   EL_BDX_EXPANDABLE_WALL_ANY_SCANNED,
+  EL_BDX_FALLING_WALL_FALLING_SCANNED,
+
   EL_BDX_EXPANDABLE_STEELWALL_HORIZONTAL_SCANNED,
   EL_BDX_EXPANDABLE_STEELWALL_VERTICAL_SCANNED,
   EL_BDX_EXPANDABLE_STEELWALL_ANY_SCANNED,
-  EL_BDX_ACID_SCANNED,
-  EL_BDX_FALLING_WALL_FALLING_SCANNED,
-  EL_BDX_COW_LEFT_SCANNED,
-  EL_BDX_COW_UP_SCANNED,
-  EL_BDX_COW_RIGHT_SCANNED,
-  EL_BDX_COW_DOWN_SCANNED,
+  EL_EMPTY,
+
   EL_BDX_AMOEBA_1_SCANNED,
   EL_BDX_AMOEBA_2_SCANNED,
   EL_BDX_WAITING_ROCK_SCANNED,
   EL_BDX_CHASING_ROCK_SCANNED,
+
   EL_BDX_GHOST_SCANNED,
-  EL_BDX_FIREFLY_1_RIGHT_SCANNED,
+  EL_BDX_BUTTERFLY_1_UP_SCANNED,
   EL_BDX_FIREFLY_1_UP_SCANNED,
+  EL_BDX_ACID_SCANNED,
+
+  EL_BDX_BUTTERFLY_1_LEFT_SCANNED,
   EL_BDX_FIREFLY_1_LEFT_SCANNED,
-  EL_BDX_FIREFLY_1_DOWN_SCANNED,
-  EL_BDX_FIREFLY_2_RIGHT_SCANNED,
-  EL_BDX_FIREFLY_2_UP_SCANNED,
-  EL_BDX_FIREFLY_2_LEFT_SCANNED,
-  EL_BDX_FIREFLY_2_DOWN_SCANNED,
   EL_BDX_BUTTERFLY_1_RIGHT_SCANNED,
-  EL_BDX_BUTTERFLY_1_UP_SCANNED,
-  EL_BDX_BUTTERFLY_1_LEFT_SCANNED,
+  EL_BDX_FIREFLY_1_RIGHT_SCANNED,
+
+  EL_EMPTY,
   EL_BDX_BUTTERFLY_1_DOWN_SCANNED,
-  EL_BDX_BUTTERFLY_2_RIGHT_SCANNED,
+  EL_BDX_FIREFLY_1_DOWN_SCANNED,
+  EL_EMPTY,
+
+  EL_EMPTY,
   EL_BDX_BUTTERFLY_2_UP_SCANNED,
+  EL_BDX_FIREFLY_2_UP_SCANNED,
+  EL_EMPTY,
+
   EL_BDX_BUTTERFLY_2_LEFT_SCANNED,
+  EL_BDX_FIREFLY_2_LEFT_SCANNED,
+  EL_BDX_BUTTERFLY_2_RIGHT_SCANNED,
+  EL_BDX_FIREFLY_2_RIGHT_SCANNED,
+
+  EL_EMPTY,
   EL_BDX_BUTTERFLY_2_DOWN_SCANNED,
-  EL_BDX_STONEFLY_RIGHT_SCANNED,
+  EL_BDX_FIREFLY_2_DOWN_SCANNED,
+  EL_EMPTY,
+
+  EL_EMPTY,
+  EL_BDX_DRAGONFLY_UP_SCANNED,
   EL_BDX_STONEFLY_UP_SCANNED,
+  EL_EMPTY,
+
+  EL_BDX_DRAGONFLY_LEFT_SCANNED,
   EL_BDX_STONEFLY_LEFT_SCANNED,
+  EL_BDX_DRAGONFLY_RIGHT_SCANNED,
+  EL_BDX_STONEFLY_RIGHT_SCANNED,
+
+  EL_EMPTY,
+  EL_BDX_DRAGONFLY_DOWN_SCANNED,
   EL_BDX_STONEFLY_DOWN_SCANNED,
-  EL_BDX_BITER_RIGHT_SCANNED,
+  EL_EMPTY,
+
+  EL_EMPTY,
   EL_BDX_BITER_UP_SCANNED,
+  EL_BDX_COW_UP_SCANNED,
+  EL_EMPTY,
+
   EL_BDX_BITER_LEFT_SCANNED,
+  EL_BDX_COW_LEFT_SCANNED,
+  EL_BDX_BITER_RIGHT_SCANNED,
+  EL_BDX_COW_RIGHT_SCANNED,
+
+  EL_EMPTY,
   EL_BDX_BITER_DOWN_SCANNED,
-  EL_BDX_DRAGONFLY_RIGHT_SCANNED,
-  EL_BDX_DRAGONFLY_UP_SCANNED,
-  EL_BDX_DRAGONFLY_LEFT_SCANNED,
-  EL_BDX_DRAGONFLY_DOWN_SCANNED,
-  EL_BDX_PLAYER_SCANNED,
-  EL_BDX_PLAYER_WITH_BOMB_SCANNED,
-  EL_BDX_PLAYER_WITH_ROCKET_LAUNCHER_SCANNED,
+  EL_BDX_COW_DOWN_SCANNED,
+  EL_EMPTY,
+
   EL_BDX_ROCKET_RIGHT_SCANNED,
   EL_BDX_ROCKET_UP_SCANNED,
   EL_BDX_ROCKET_LEFT_SCANNED,
   EL_BDX_ROCKET_DOWN_SCANNED,
-  EL_BDX_NITRO_PACK_SCANNED,
-  EL_BDX_NITRO_PACK_FALLING_SCANNED,
-  EL_BDX_NITRO_PACK_EXPLODING_SCANNED,
+
+  EL_BDX_PLAYER_SCANNED,
+  EL_BDX_PLAYER_WITH_BOMB_SCANNED,
+  EL_BDX_PLAYER_WITH_ROCKET_LAUNCHER_SCANNED,
   EL_BDX_CLOCK_GROWING_0,
+
   EL_BDX_DIAMOND_GROWING_0,
   EL_BDX_EXPLODING_0,
   EL_BDX_ROCK_GROWING_0,
   EL_BDX_STEELWALL_GROWING_0,
+
   EL_BDX_GHOST_EXPLODING_0,
   EL_BDX_BOMB_EXPLODING_0,
   EL_BDX_NITRO_PACK_EXPLODING_0,
   EL_BDX_AMOEBA_2_EXPLODING_0,
+
   EL_BDX_NUT_BREAKING_0,
+  EL_BDX_NITRO_PACK_SCANNED,
+  EL_BDX_NITRO_PACK_FALLING_SCANNED,
+  EL_BDX_NITRO_PACK_EXPLODING_SCANNED,
 };
 static int *editor_hl_boulderdash_scanned_ptr = editor_hl_boulderdash_scanned;
 static int *editor_el_boulderdash_scanned_ptr = editor_el_boulderdash_scanned;