From eff9ca8f8d7353c5a696213cf0922e2183935e21 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sun, 6 Oct 2024 10:24:49 +0200 Subject: [PATCH] renamed BD style game element "sand_ball" to "grass_ball" --- docs/elements/bdx_sand_ball.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_ball.txt diff --git a/docs/elements/bdx_sand_ball.txt b/docs/elements/bdx_sand_ball.txt deleted file mode 100644 index 4081eca4..00000000 --- a/docs/elements/bdx_sand_ball.txt +++ /dev/null @@ -1 +0,0 @@ -A rolling ball 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 1cf6c426..1557ab6a 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -584,10 +584,10 @@ struct ConfigInfo image_config[] = { "bdx_grass", UNDEFINED_FILENAME }, { "bdx_grass.clone_from", "emc_grass" }, - { "bdx_sand_ball", "RocksBD.png" }, - { "bdx_sand_ball.xpos", "9" }, - { "bdx_sand_ball.ypos", "4" }, - { "bdx_sand_ball.frames", "1" }, + { "bdx_grass_ball", "RocksBD.png" }, + { "bdx_grass_ball.xpos", "9" }, + { "bdx_grass_ball.ypos", "4" }, + { "bdx_grass_ball.frames", "1" }, { "bdx_sand_loose", "RocksBD.png" }, { "bdx_sand_loose.xpos", "10" }, diff --git a/src/conf_snd.c b/src/conf_snd.c index 1d7b847b..3bfa619b 100644 --- a/src/conf_snd.c +++ b/src/conf_snd.c @@ -64,8 +64,8 @@ struct ConfigInfo sound_config[] = { "bd_firefly.waiting", "roehr.wav" }, // sounds for Boulder Dash style elements and actions (native game engine) - { "bdx_sand_ball.falling", "schlurf.wav" }, - { "bdx_sand_ball.impact", "schlurf.wav" }, + { "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_diamond.collecting", "pong.wav" }, diff --git a/src/editor.c b/src/editor.c index af456a79..3a16d8ee 100644 --- a/src/editor.c +++ b/src/editor.c @@ -5710,7 +5710,7 @@ static int editor_el_boulderdash_native[] = EL_BDX_GHOST, EL_BDX_SAND_GLUED, - EL_BDX_SAND_BALL, + EL_BDX_GRASS_BALL, EL_BDX_SAND_LOOSE, EL_BDX_WALL_NON_SLOPED, @@ -5819,7 +5819,7 @@ static int editor_el_boulderdash_effects[] = EL_BDX_NUT_FALLING, EL_BDX_NITRO_PACK_FALLING, - EL_BDX_SAND_BALL_FALLING, + EL_BDX_GRASS_BALL_FALLING, EL_BDX_SAND_LOOSE_FALLING, EL_BDX_FALLING_WALL_FALLING, EL_EMPTY, @@ -5959,8 +5959,8 @@ static int editor_hl_boulderdash_scanned[] = static int editor_el_boulderdash_scanned[] = { - EL_BDX_SAND_BALL_SCANNED, - EL_BDX_SAND_BALL_FALLING_SCANNED, + EL_BDX_GRASS_BALL_SCANNED, + EL_BDX_GRASS_BALL_FALLING_SCANNED, EL_BDX_SAND_LOOSE_SCANNED, EL_BDX_SAND_LOOSE_FALLING_SCANNED, diff --git a/src/main.c b/src/main.c index 10d4ca51..6fa8423c 100644 --- a/src/main.c +++ b/src/main.c @@ -6478,9 +6478,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Grass" }, { - "bdx_sand_ball", - "bdx_sand_ball", - "Sand ball" + "bdx_grass_ball", + "bdx_grass_ball", + "Grass ball" }, { "bdx_sand_loose", @@ -7243,9 +7243,9 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Light rock" }, { - "bdx_sand_ball.falling", - "bdx_sand_ball", - "Sand ball (falling)" + "bdx_grass_ball.falling", + "bdx_grass_ball", + "Grass ball (falling)" }, { "bdx_sand_loose.falling", @@ -7718,14 +7718,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Nut explosion (4)" }, { - "bdx_sand_ball.scanned", - "bdx_sand_ball", - "Sand ball (scanned)" + "bdx_grass_ball.scanned", + "bdx_grass_ball", + "Grass ball (scanned)" }, { - "bdx_sand_ball.falling.scanned", - "bdx_sand_ball", - "Sand ball (falling) (scanned)" + "bdx_grass_ball.falling.scanned", + "bdx_grass_ball", + "Grass ball (falling) (scanned)" }, { "bdx_sand_loose.scanned", diff --git a/src/main.h b/src/main.h index 5d56959b..f5e66607 100644 --- a/src/main.h +++ b/src/main.h @@ -2092,7 +2092,7 @@ #define EL_BDX_EMPTY EL_BDX_EMPTY_SPACE #define EL_BDX_SAND 1254 #define EL_BDX_GRASS 1255 -#define EL_BDX_SAND_BALL 1256 +#define EL_BDX_GRASS_BALL 1256 #define EL_BDX_SAND_LOOSE 1257 #define EL_BDX_SAND_SLOPED_UP_RIGHT 1258 #define EL_BDX_SAND_SLOPED_UP_LEFT 1259 @@ -2250,7 +2250,7 @@ #define EL_BDX_RUNTIME_START 1409 #define EL_BDX_EFFECTS_START EL_BDX_RUNTIME_START -#define EL_BDX_SAND_BALL_FALLING EL_BDX_EFFECTS_START +#define EL_BDX_GRASS_BALL_FALLING EL_BDX_EFFECTS_START #define EL_BDX_SAND_LOOSE_FALLING 1410 #define EL_BDX_ROCK_FALLING 1411 #define EL_BDX_FLYING_ROCK_FLYING 1412 @@ -2348,8 +2348,8 @@ #define EL_BDX_EFFECTS_END EL_BDX_NUT_BREAKING_4 #define EL_BDX_SCANNED_START 1504 -#define EL_BDX_SAND_BALL_SCANNED EL_BDX_SCANNED_START -#define EL_BDX_SAND_BALL_FALLING_SCANNED 1505 +#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_ROCK_SCANNED 1508 diff --git a/src/tools.c b/src/tools.c index 0f55010d..e9d32bb1 100644 --- a/src/tools.c +++ b/src/tools.c @@ -6140,15 +6140,15 @@ bd_object_mapping_list[] = }, { O_DIRT_BALL, TRUE, - EL_BDX_SAND_BALL, -1, -1 + EL_BDX_GRASS_BALL, -1, -1 }, { O_DIRT_BALL_F, TRUE, - EL_BDX_SAND_BALL_FALLING, -1, -1 + EL_BDX_GRASS_BALL_FALLING, -1, -1 }, { O_DIRT_BALL_F, FALSE, - EL_BDX_SAND_BALL, ACTION_FALLING, -1 + EL_BDX_GRASS_BALL, ACTION_FALLING, -1 }, { O_DIRT_LOOSE, TRUE, @@ -7427,11 +7427,11 @@ bd_object_mapping_list[] = { O_DIRT_BALL_scanned, TRUE, - EL_BDX_SAND_BALL_SCANNED, -1, -1 + EL_BDX_GRASS_BALL_SCANNED, -1, -1 }, { O_DIRT_BALL_F_scanned, TRUE, - EL_BDX_SAND_BALL_FALLING_SCANNED, -1, -1 + EL_BDX_GRASS_BALL_FALLING_SCANNED, -1, -1 }, { O_DIRT_LOOSE_scanned, TRUE, -- 2.34.1