renamed BD style game element "sand_ball" to "grass_ball"

diff --git a/docs/elements/bdx_sand_ball.txt b/docs/elements/bdx_sand_ball.txt
deleted file mode 100644 (file)
index 4081eca..0000000
--- 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 1cf6c4266213130894f63c26cc8c60be5310cb99..1557ab6a7e96d3e9cece09a02ab09c0199df2565 100644 (file)
--- 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 1d7b847b690acbad8cef7cf48b2db5f78df04ded..3bfa619bb4c9aaa05d34d38768b0166d390dc902 100644 (file)
--- 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 af456a79af124db441470b4ae0e820a07e059e50..3a16d8eeec9e844f8cd0af50b4ff73772ebbaee3 100644 (file)
--- 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 10d4ca51dec04616e6cc996a85885402c9f76530..6fa8423ceea2c3d4eca5cb1f7b0e4a2f14c47ad8 100644 (file)
--- 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 5d56959b2ea35c366b046deacbbf8395dc2144b7..f5e66607e13bfdc04b16572aae5850e574dee1e1 100644 (file)
--- 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 0f55010d007fe2cb5a4f270197cabe3e66d392b6..e9d32bb1c0821f8b00e232d1f23b7d21e7786383 100644 (file)
--- 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,