renamed BD style game element "sand_1" to "sand"

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index d755df89bd93de811b1561790f495d7630715210..1cf6c4266213130894f63c26cc8c60be5310cb99 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -578,8 +578,8 @@ struct ConfigInfo image_config[] =
   { "bdx_firefly_2.down.EDITOR.xpos",                  "11"                            },
   { "bdx_firefly_2.down.EDITOR.ypos",                  "0"                             },
 
-  { "bdx_sand_1",                                      UNDEFINED_FILENAME              },
-  { "bdx_sand_1.clone_from",                           "sand"                          },
+  { "bdx_sand",                                                UNDEFINED_FILENAME              },
+  { "bdx_sand.clone_from",                             "sand"                          },
 
   { "bdx_grass",                                       UNDEFINED_FILENAME              },
   { "bdx_grass.clone_from",                            "emc_grass"                     },
@@ -612,7 +612,7 @@ struct ConfigInfo image_config[] =
   { "bdx_sand_sloped_down_right.frames",               "1"                             },
 
   { "bdx_sand_glued",                                  UNDEFINED_FILENAME              },
-  { "bdx_sand_glued.clone_from",                       "bdx_sand_1"                    },
+  { "bdx_sand_glued.clone_from",                       "bdx_sand"                      },
   { "bdx_sand_glued.EDITOR",                           "RocksBD2.png"                  },
   { "bdx_sand_glued.EDITOR.xpos",                      "2"                             },
   { "bdx_sand_glued.EDITOR.ypos",                      "4"                             },

diff --git a/src/editor.c b/src/editor.c
index 583a80349317c9575d62a7242d81220db827a0e8..af456a79af124db441470b4ae0e820a07e059e50 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -5640,7 +5640,7 @@ static int editor_hl_boulderdash_native[] =
 static int editor_el_boulderdash_native[] =
 {
   EL_EMPTY,
-  EL_BDX_SAND_1,
+  EL_BDX_SAND,
   EL_BDX_ROCK,
   EL_BDX_DIAMOND,
 
@@ -12694,7 +12694,7 @@ static boolean checkPropertiesConfig(int element)
       CAN_GROW(element) ||
       COULD_MOVE_INTO_ACID(element) ||
       MAYBE_DONT_COLLIDE_WITH(element) ||
-      element == EL_BDX_SAND_1 ||
+      element == EL_BDX_SAND ||
       element == EL_BDX_ROCK ||
       element == EL_BDX_HEAVY_ROCK ||
       element == EL_BDX_BOMB ||
@@ -13025,7 +13025,7 @@ static void DrawPropertiesConfig(void)
     MapDrawingArea(ED_DRAWING_ID_BD_SNAP_ELEMENT);
   }
 
-  if (properties_element == EL_BDX_SAND_1)
+  if (properties_element == EL_BDX_SAND)
   {
     MapDrawingArea(ED_DRAWING_ID_BD_SAND_LOOKS_LIKE);
   }

diff --git a/src/files.c b/src/files.c
index 5faf5f363b3383d9c7f7d87338dd82b4b613d5c4..4c76726004086efd1100bfbfceea3f4adcdbd39a 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -676,9 +676,9 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
   },
 
   {
-    EL_BDX_SAND_1,                     -1,
+    EL_BDX_SAND,                       -1,
     TYPE_ELEMENT,                      CONF_VALUE_16_BIT(1),
-    &li.bd_sand_looks_like,            EL_BDX_SAND_1
+    &li.bd_sand_looks_like,            EL_BDX_SAND
   },
 
   {
@@ -925,7 +925,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
   {
     EL_BDX_ACID,                       -1,
     TYPE_ELEMENT,                      CONF_VALUE_16_BIT(1),
-    &li.bd_acid_eats_element,          EL_BDX_SAND_1
+    &li.bd_acid_eats_element,          EL_BDX_SAND
   },
   {
     EL_BDX_ACID,                       -1,

diff --git a/src/game.c b/src/game.c
index 9866f9005690b44544bad7ccd5a31fc4c100107e..b65d2431d3c65d8fa91b21756d844a7b7baa4d92 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1843,7 +1843,7 @@ static void InitFieldForEngine_RND(int x, int y)
   element = (element == EL_BDX_EMPTY                           ? EL_EMPTY :
             element == EL_BDX_PLAYER                           ? EL_PLAYER_1 :
             element == EL_BDX_INBOX                            ? EL_PLAYER_1 :
-            element == EL_BDX_SAND_1                           ? EL_SAND :
+            element == EL_BDX_SAND                             ? EL_SAND :
             element == EL_BDX_WALL                             ? EL_BD_WALL :
             element == EL_BDX_STEELWALL                        ? EL_STEELWALL :
             element == EL_BDX_ROCK                             ? EL_BD_ROCK :

diff --git a/src/main.c b/src/main.c
index 0a406e6d295ac05c80a367677b0d187cf37fb636..10d4ca51dec04616e6cc996a85885402c9f76530 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -6468,7 +6468,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Empty space"
   },
   {
-    "bdx_sand_1",
+    "bdx_sand",
     "bdx_sand",
     "Sand"
   },

diff --git a/src/main.h b/src/main.h
index 8fc262737e3d06cb35924fe3110b80c064bb8264..5d56959b2ea35c366b046deacbbf8395dc2144b7 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2090,7 +2090,7 @@
 #define EL_BDX_START                           1253
 #define EL_BDX_EMPTY_SPACE                     EL_BDX_START
 #define EL_BDX_EMPTY                           EL_BDX_EMPTY_SPACE
-#define EL_BDX_SAND_1                          1254
+#define EL_BDX_SAND                            1254
 #define EL_BDX_GRASS                           1255
 #define EL_BDX_SAND_BALL                       1256
 #define EL_BDX_SAND_LOOSE                      1257

diff --git a/src/tools.c b/src/tools.c
index 08db116cdf84a8234a712cfd107421d212572b37..0f55010d007fe2cb5a4f270197cabe3e66d392b6 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -5992,7 +5992,7 @@ static int getEngineElement_Ext(int element, int game_engine_type, boolean is_dr
   {
     el_empty           = EL_EMPTY;
     el_player          = EL_BDX_PLAYER;
-    el_sand            = EL_BDX_SAND_1;
+    el_sand            = EL_BDX_SAND;
     el_wall            = EL_BDX_WALL;
     el_steelwall       = EL_BDX_STEELWALL;
     el_exit_closed     = EL_BDX_EXIT_CLOSED;
@@ -6120,7 +6120,7 @@ bd_object_mapping_list[] =
   },
   {
     O_DIRT,                                    TRUE,
-    EL_BDX_SAND_1,                             -1, -1
+    EL_BDX_SAND,                               -1, -1
   },
   {
     O_DIRT_SLOPED_UP_RIGHT,                    TRUE,