From cd9a273bfd1ade6b7ed37681acf7237b5db63720 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sun, 6 Oct 2024 10:29:21 +0200 Subject: [PATCH] renamed BD style game element "sand_loose" to "grass_loose" --- docs/elements/bdx_sand_loose.txt | 1 - src/conf_gfx.c | 8 ++++---- src/conf_snd.c | 4 ++-- src/editor.c | 8 ++++---- src/main.c | 24 ++++++++++++------------ src/main.h | 8 ++++---- src/tools.c | 10 +++++----- 7 files changed, 31 insertions(+), 32 deletions(-) delete mode 100644 docs/elements/bdx_sand_loose.txt diff --git a/docs/elements/bdx_sand_loose.txt b/docs/elements/bdx_sand_loose.txt deleted file mode 100644 index 125daa0f..00000000 --- a/docs/elements/bdx_sand_loose.txt +++ /dev/null @@ -1 +0,0 @@ -A falling piece of sand. You cannot push it, but you can dig it away. diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 1557ab6a..8eece06a 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -589,10 +589,10 @@ struct ConfigInfo image_config[] = { "bdx_grass_ball.ypos", "4" }, { "bdx_grass_ball.frames", "1" }, - { "bdx_sand_loose", "RocksBD.png" }, - { "bdx_sand_loose.xpos", "10" }, - { "bdx_sand_loose.ypos", "4" }, - { "bdx_sand_loose.frames", "1" }, + { "bdx_grass_loose", "RocksBD.png" }, + { "bdx_grass_loose.xpos", "10" }, + { "bdx_grass_loose.ypos", "4" }, + { "bdx_grass_loose.frames", "1" }, { "bdx_sand_sloped_up_left", "RocksBD.png" }, { "bdx_sand_sloped_up_left.xpos", "8" }, diff --git a/src/conf_snd.c b/src/conf_snd.c index 3bfa619b..815ed400 100644 --- a/src/conf_snd.c +++ b/src/conf_snd.c @@ -66,8 +66,8 @@ struct ConfigInfo sound_config[] = // sounds for Boulder Dash style elements and actions (native game engine) { "bdx_grass_ball.falling", "schlurf.wav" }, { "bdx_grass_ball.impact", "schlurf.wav" }, - { "bdx_sand_loose.falling", "schlurf.wav" }, - { "bdx_sand_loose.impact", "schlurf.wav" }, + { "bdx_grass_loose.falling", "schlurf.wav" }, + { "bdx_grass_loose.impact", "schlurf.wav" }, { "bdx_diamond.collecting", "pong.wav" }, { "bdx_diamond.falling", "pling.wav" }, { "bdx_diamond.impact", "pling.wav" }, diff --git a/src/editor.c b/src/editor.c index 3a16d8ee..04e28920 100644 --- a/src/editor.c +++ b/src/editor.c @@ -5711,7 +5711,7 @@ static int editor_el_boulderdash_native[] = EL_BDX_SAND_GLUED, EL_BDX_GRASS_BALL, - EL_BDX_SAND_LOOSE, + EL_BDX_GRASS_LOOSE, EL_BDX_WALL_NON_SLOPED, EL_BDX_SAND_SLOPED_UP_LEFT, @@ -5820,7 +5820,7 @@ static int editor_el_boulderdash_effects[] = EL_BDX_NITRO_PACK_FALLING, EL_BDX_GRASS_BALL_FALLING, - EL_BDX_SAND_LOOSE_FALLING, + EL_BDX_GRASS_LOOSE_FALLING, EL_BDX_FALLING_WALL_FALLING, EL_EMPTY, @@ -5961,8 +5961,8 @@ static int editor_el_boulderdash_scanned[] = { EL_BDX_GRASS_BALL_SCANNED, EL_BDX_GRASS_BALL_FALLING_SCANNED, - EL_BDX_SAND_LOOSE_SCANNED, - EL_BDX_SAND_LOOSE_FALLING_SCANNED, + EL_BDX_GRASS_LOOSE_SCANNED, + EL_BDX_GRASS_LOOSE_FALLING_SCANNED, EL_BDX_ROCK_SCANNED, EL_BDX_ROCK_FALLING_SCANNED, diff --git a/src/main.c b/src/main.c index 6fa8423c..37e7cbbb 100644 --- a/src/main.c +++ b/src/main.c @@ -6483,9 +6483,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Grass ball" }, { - "bdx_sand_loose", - "bdx_sand_loose", - "Loose sand" + "bdx_grass_loose", + "bdx_grass_loose", + "Loose grass" }, { "bdx_sand_sloped_up_right", @@ -7248,9 +7248,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Grass ball (falling)" }, { - "bdx_sand_loose.falling", - "bdx_sand_loose", - "Loose sand (falling)" + "bdx_grass_loose.falling", + "bdx_grass_loose", + "Loose grass (falling)" }, { "bdx_rock.falling", @@ -7728,14 +7728,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Grass ball (falling) (scanned)" }, { - "bdx_sand_loose.scanned", - "bdx_sand_loose", - "Loose sand (scanned)" + "bdx_grass_loose.scanned", + "bdx_grass_loose", + "Loose grass (scanned)" }, { - "bdx_sand_loose.falling.scanned", - "bdx_sand_loose", - "Loose sand (falling) (scanned)" + "bdx_grass_loose.falling.scanned", + "bdx_grass_loose", + "Loose grass (falling) (scanned)" }, { "bdx_rock.scanned", diff --git a/src/main.h b/src/main.h index f5e66607..8b477c85 100644 --- a/src/main.h +++ b/src/main.h @@ -2093,7 +2093,7 @@ #define EL_BDX_SAND 1254 #define EL_BDX_GRASS 1255 #define EL_BDX_GRASS_BALL 1256 -#define EL_BDX_SAND_LOOSE 1257 +#define EL_BDX_GRASS_LOOSE 1257 #define EL_BDX_SAND_SLOPED_UP_RIGHT 1258 #define EL_BDX_SAND_SLOPED_UP_LEFT 1259 #define EL_BDX_SAND_SLOPED_DOWN_LEFT 1260 @@ -2251,7 +2251,7 @@ #define EL_BDX_EFFECTS_START EL_BDX_RUNTIME_START #define EL_BDX_GRASS_BALL_FALLING EL_BDX_EFFECTS_START -#define EL_BDX_SAND_LOOSE_FALLING 1410 +#define EL_BDX_GRASS_LOOSE_FALLING 1410 #define EL_BDX_ROCK_FALLING 1411 #define EL_BDX_FLYING_ROCK_FLYING 1412 #define EL_BDX_HEAVY_ROCK_FALLING 1413 @@ -2350,8 +2350,8 @@ #define EL_BDX_SCANNED_START 1504 #define EL_BDX_GRASS_BALL_SCANNED EL_BDX_SCANNED_START #define EL_BDX_GRASS_BALL_FALLING_SCANNED 1505 -#define EL_BDX_SAND_LOOSE_SCANNED 1506 -#define EL_BDX_SAND_LOOSE_FALLING_SCANNED 1507 +#define EL_BDX_GRASS_LOOSE_SCANNED 1506 +#define EL_BDX_GRASS_LOOSE_FALLING_SCANNED 1507 #define EL_BDX_ROCK_SCANNED 1508 #define EL_BDX_ROCK_FALLING_SCANNED 1509 #define EL_BDX_FLYING_ROCK_SCANNED 1510 diff --git a/src/tools.c b/src/tools.c index e9d32bb1..f3dbcf6f 100644 --- a/src/tools.c +++ b/src/tools.c @@ -6152,15 +6152,15 @@ bd_object_mapping_list[] = }, { O_DIRT_LOOSE, TRUE, - EL_BDX_SAND_LOOSE, -1, -1 + EL_BDX_GRASS_LOOSE, -1, -1 }, { O_DIRT_LOOSE_F, TRUE, - EL_BDX_SAND_LOOSE_FALLING, -1, -1 + EL_BDX_GRASS_LOOSE_FALLING, -1, -1 }, { O_DIRT_LOOSE_F, FALSE, - EL_BDX_SAND_LOOSE, ACTION_FALLING, -1 + EL_BDX_GRASS_LOOSE, ACTION_FALLING, -1 }, { O_DIRT2, TRUE, @@ -7435,11 +7435,11 @@ bd_object_mapping_list[] = }, { O_DIRT_LOOSE_scanned, TRUE, - EL_BDX_SAND_LOOSE_SCANNED, -1, -1 + EL_BDX_GRASS_LOOSE_SCANNED, -1, -1 }, { O_DIRT_LOOSE_F_scanned, TRUE, - EL_BDX_SAND_LOOSE_FALLING_SCANNED, -1, -1 + EL_BDX_GRASS_LOOSE_FALLING_SCANNED, -1, -1 }, { O_STONE_scanned, TRUE, -- 2.34.1