renamed BD style game element "sand_2" to "grass"

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 9d30d7f34d1f4fb96572118faff6ff0b5bc4c5a7..d755df89bd93de811b1561790f495d7630715210 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -581,8 +581,8 @@ struct ConfigInfo image_config[] =
   { "bdx_sand_1",                                      UNDEFINED_FILENAME              },
   { "bdx_sand_1.clone_from",                           "sand"                          },
 
-  { "bdx_sand_2",                                      UNDEFINED_FILENAME              },
-  { "bdx_sand_2.clone_from",                           "emc_grass"                     },
+  { "bdx_grass",                                       UNDEFINED_FILENAME              },
+  { "bdx_grass.clone_from",                            "emc_grass"                     },
 
   { "bdx_sand_ball",                                   "RocksBD.png"                   },
   { "bdx_sand_ball.xpos",                              "9"                             },

diff --git a/src/editor.c b/src/editor.c
index ba122fde9d01f82636595972e5448a5699b6c63d..583a80349317c9575d62a7242d81220db827a0e8 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -5659,7 +5659,7 @@ static int editor_el_boulderdash_native[] =
   EL_BDX_BUTTERFLY_1_RIGHT,
   EL_BDX_FIREFLY_1_RIGHT,
 
-  EL_BDX_SAND_2,
+  EL_BDX_GRASS,
   EL_BDX_BUTTERFLY_1_DOWN,
   EL_BDX_FIREFLY_1_DOWN,
   EL_BDX_EXIT_OPEN,

diff --git a/src/main.c b/src/main.c
index 693553e81f0ccd2e21ad85274d0dd273d390525d..0a406e6d295ac05c80a367677b0d187cf37fb636 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -6473,9 +6473,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Sand"
   },
   {
-    "bdx_sand_2",
-    "bdx_sand",
-    "Sand 2"
+    "bdx_grass",
+    "bdx_grass",
+    "Grass"
   },
   {
     "bdx_sand_ball",

diff --git a/src/main.h b/src/main.h
index d7d32fbfa51013ad0b294b8b9827fd3fc19c8448..8fc262737e3d06cb35924fe3110b80c064bb8264 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2091,7 +2091,7 @@
 #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_2                          1255
+#define EL_BDX_GRASS                           1255
 #define EL_BDX_SAND_BALL                       1256
 #define EL_BDX_SAND_LOOSE                      1257
 #define EL_BDX_SAND_SLOPED_UP_RIGHT            1258

diff --git a/src/tools.c b/src/tools.c
index db3291fcf1e9a7e9af5d6b06365d48edcfcea6ee..08db116cdf84a8234a712cfd107421d212572b37 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -6164,7 +6164,7 @@ bd_object_mapping_list[] =
   },
   {
     O_DIRT2,                                   TRUE,
-    EL_BDX_SAND_2,                             -1, -1
+    EL_BDX_GRASS,                              -1, -1
   },
   {
     O_BRICK,                                   TRUE,