changed logic and defaults for falling element sounds in BD engine

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 954e7a63c83ed8adb95db77cbb2d981e77d4ba32..1881220a079c35dc07baa93eb65611af9040a447 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -7166,7 +7166,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_1,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_2,                               TRUE,
@@ -7174,7 +7174,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_2,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_3,                               TRUE,
@@ -7182,7 +7182,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_3,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_4,                               TRUE,
@@ -7190,7 +7190,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_4,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_EXPLODE_5,                               TRUE,
@@ -7198,7 +7198,7 @@ bd_object_mapping_list[] =
   },
   {
     O_EXPLODE_5,                               FALSE,
-    EL_DEFAULT,                                        ACTION_EXPLODING, -1
+    EL_BDX_DEFAULT,                            ACTION_EXPLODING, -1
   },
   {
     O_PRE_STONE_1,                             TRUE,
@@ -10710,6 +10710,9 @@ void InitGraphicInfo_BD(void)
 {
   int i, j;
 
+  if (graphic_info == NULL)            // still at startup phase
+    return;
+
   // always start with reliable default values
   for (i = 0; i < O_MAX_ALL; i++)
   {