From 92df7db77551595a758bf7f55d35d5dd11f0bcdc Mon Sep 17 00:00:00 2001
From: Holger Schemel <holger.schemel@virtion.de>
Date: Sun, 6 Oct 2024 10:07:37 +0200
Subject: [PATCH] renamed BD style game element "sand_2" to "grass"

---
 src/conf_gfx.c | 4 ++--
 src/editor.c   | 2 +-
 src/main.c     | 6 +++---
 src/main.h     | 2 +-
 src/tools.c    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 9d30d7f3..d755df89 100644
--- 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 ba122fde..583a8034 100644
--- 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 693553e8..0a406e6d 100644
--- 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 d7d32fbf..8fc26273 100644
--- 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 db3291fc..08db116c 100644
--- 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,
-- 
2.34.1