From a1504746bee3f0951b7dafc761cdad8f5abb1e42 Mon Sep 17 00:00:00 2001
From: Holger Schemel <holger.schemel@virtion.de>
Date: Sun, 6 Oct 2024 10:16:25 +0200
Subject: [PATCH] renamed BD style game element "sand_1" to "sand"

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

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index d755df89..1cf6c426 100644
--- 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 583a8034..af456a79 100644
--- 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 5faf5f36..4c767260 100644
--- 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 9866f900..b65d2431 100644
--- 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 0a406e6d..10d4ca51 100644
--- 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 8fc26273..5d56959b 100644
--- 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 08db116c..0f55010d 100644
--- 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,
-- 
2.34.1