X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2s.c;h=825dc7a687bd840b147cfbcb18fa1498e5ab749e;hb=90c3a49422dd88de77ffc7b8dd1d4f1d73d0d9a3;hp=0fef9ca377780a9c155532b07823b245a90aa463;hpb=ba30b2aedd9a673be5c23ebb2c5f25a4616daaa5;p=rocksndiamonds.git

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index 0fef9ca3..825dc7a6 100644
--- a/src/conf_e2s.c
+++ b/src/conf_e2s.c
@@ -28,6 +28,46 @@ static struct
 }
 element_to_sound[] =
 {
+  {
+    EL_DEFAULT, TRUE,				ACTION_DIGGING,
+    SND_CLASS_DEFAULT_DIGGING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_COLLECTING,
+    SND_CLASS_DEFAULT_COLLECTING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_SNAPPING,
+    SND_CLASS_DEFAULT_SNAPPING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_PUSHING,
+    SND_CLASS_DEFAULT_PUSHING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_IMPACT,
+    SND_CLASS_DEFAULT_IMPACT
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_WALKING,
+    SND_CLASS_DEFAULT_WALKING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_PASSING,
+    SND_CLASS_DEFAULT_PASSING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_DYING,
+    SND_CLASS_DEFAULT_DYING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_EXPLODING,
+    SND_CLASS_DEFAULT_EXPLODING
+  },
+  {
+    EL_SP_DEFAULT, TRUE,			ACTION_EXPLODING,
+    SND_CLASS_SP_DEFAULT_EXPLODING
+  },
   {
     EL_BD_DIAMOND, FALSE,			ACTION_COLLECTING,
     SND_BD_DIAMOND_COLLECTING
@@ -144,6 +184,10 @@ element_to_sound[] =
     EL_SP_EXIT_CLOSED, TRUE,			ACTION_OPENING,
     SND_CLASS_SP_EXIT_OPENING
   },
+  {
+    EL_SP_EXIT_CLOSED, TRUE,			ACTION_CLOSING,
+    SND_CLASS_SP_EXIT_CLOSING
+  },
   {
     EL_SP_SNIKSNAK, FALSE,			ACTION_MOVING,
     SND_SP_SNIKSNAK_MOVING
@@ -173,32 +217,32 @@ element_to_sound[] =
     SND_SP_TERMINAL_ACTIVE
   },
   {
-    EL_SOKOBAN_OBJECT, TRUE,			ACTION_PUSHING,
+    EL_SOKOBAN_FIELD_PLAYER, TRUE,		ACTION_PUSHING,
     SND_CLASS_SOKOBAN_PUSHING
   },
   {
-    EL_SOKOBAN_OBJECT, TRUE,			ACTION_FILLING,
+    EL_SOKOBAN_FIELD_PLAYER, TRUE,		ACTION_FILLING,
     SND_CLASS_SOKOBAN_FILLING
   },
   {
-    EL_SOKOBAN_OBJECT, TRUE,			ACTION_EMPTYING,
+    EL_SOKOBAN_FIELD_PLAYER, TRUE,		ACTION_EMPTYING,
     SND_CLASS_SOKOBAN_EMPTYING
   },
   {
-    EL_EMPTY_SPACE, FALSE,			ACTION_DIGGING,
-    SND_EMPTY_SPACE_DIGGING
+    EL_PLAYER_1, TRUE,				ACTION_MOVING,
+    SND_CLASS_PLAYER_MOVING
   },
   {
     EL_SAND, FALSE,				ACTION_DIGGING,
     SND_SAND_DIGGING
   },
   {
-    EL_EMERALD, FALSE,				ACTION_COLLECTING,
-    SND_EMERALD_COLLECTING
+    EL_EMERALD, TRUE,				ACTION_COLLECTING,
+    SND_CLASS_EMERALD_COLLECTING
   },
   {
-    EL_EMERALD, FALSE,				ACTION_IMPACT,
-    SND_EMERALD_IMPACT
+    EL_EMERALD, TRUE,				ACTION_IMPACT,
+    SND_CLASS_EMERALD_IMPACT
   },
   {
     EL_DIAMOND, FALSE,				ACTION_COLLECTING,
@@ -208,6 +252,10 @@ element_to_sound[] =
     EL_DIAMOND, FALSE,				ACTION_IMPACT,
     SND_DIAMOND_IMPACT
   },
+  {
+    EL_DIAMOND_BREAKING, FALSE,			-1,
+    SND_DIAMOND_BREAKING
+  },
   {
     EL_DIAMOND, FALSE,				ACTION_BREAKING,
     SND_DIAMOND_BREAKING
@@ -253,7 +301,7 @@ element_to_sound[] =
     SND_CLASS_DYNAMITE_ACTIVE
   },
   {
-    EL_KEY_OBSOLETE, TRUE,			ACTION_COLLECTING,
+    EL_KEY_1, TRUE,				ACTION_COLLECTING,
     SND_CLASS_KEY_COLLECTING
   },
   {
@@ -340,6 +388,10 @@ element_to_sound[] =
     EL_AMOEBA_DEAD, TRUE,			ACTION_DROPPING,
     SND_CLASS_AMOEBA_DROPPING
   },
+  {
+    EL_ACID, FALSE,				ACTION_SPLASHING,
+    SND_ACID_SPLASHING
+  },
   {
     EL_QUICKSAND_EMPTY, TRUE,			ACTION_FILLING,
     SND_CLASS_QUICKSAND_FILLING
@@ -352,6 +404,10 @@ element_to_sound[] =
     EL_EXIT_CLOSED, TRUE,			ACTION_OPENING,
     SND_CLASS_EXIT_OPENING
   },
+  {
+    EL_EXIT_CLOSED, TRUE,			ACTION_CLOSING,
+    SND_CLASS_EXIT_CLOSING
+  },
   {
     EL_EXIT_CLOSED, TRUE,			ACTION_PASSING,
     SND_CLASS_EXIT_PASSING
@@ -392,6 +448,22 @@ element_to_sound[] =
     EL_WALL, TRUE,				ACTION_GROWING,
     SND_CLASS_WALL_GROWING
   },
+  {
+    EL_EMC_ANDROID, FALSE,			ACTION_PUSHING,
+    SND_EMC_ANDROID_PUSHING
+  },
+  {
+    EL_EMC_ANDROID, FALSE,			ACTION_MOVING,
+    SND_EMC_ANDROID_MOVING
+  },
+  {
+    EL_EMC_ANDROID, FALSE,			ACTION_DROPPING,
+    SND_EMC_ANDROID_DROPPING
+  },
+  {
+    EL_EMC_MAGIC_BALL, FALSE,			ACTION_DROPPING,
+    SND_EMC_MAGIC_BALL_DROPPING
+  },
   {
     EL_PEARL, FALSE,				ACTION_COLLECTING,
     SND_PEARL_COLLECTING
@@ -417,13 +489,25 @@ element_to_sound[] =
     SND_CRYSTAL_IMPACT
   },
   {
-    EL_ENVELOPE, FALSE,				ACTION_COLLECTING,
-    SND_ENVELOPE_COLLECTING
+    EL_ENVELOPE_1, TRUE,			ACTION_COLLECTING,
+    SND_CLASS_ENVELOPE_COLLECTING
+  },
+  {
+    EL_ENVELOPE_1, TRUE,			ACTION_OPENING,
+    SND_CLASS_ENVELOPE_OPENING
+  },
+  {
+    EL_ENVELOPE_1, TRUE,			ACTION_CLOSING,
+    SND_CLASS_ENVELOPE_CLOSING
   },
   {
     EL_INVISIBLE_SAND, FALSE,			ACTION_DIGGING,
     SND_INVISIBLE_SAND_DIGGING
   },
+  {
+    EL_INVISIBLE_SAND_ACTIVE, FALSE,		ACTION_DIGGING,
+    SND_INVISIBLE_SAND_ACTIVE_DIGGING
+  },
   {
     EL_SHIELD_NORMAL, FALSE,			ACTION_COLLECTING,
     SND_SHIELD_NORMAL_COLLECTING
@@ -541,8 +625,8 @@ element_to_sound[] =
     SND_TRAP_ACTIVATING
   },
   {
-    EL_TUBE_ANY, TRUE,				ACTION_PASSING,
-    SND_CLASS_TUBE_PASSING
+    EL_TUBE_ANY, TRUE,				ACTION_WALKING,
+    SND_CLASS_TUBE_WALKING
   },
   {
     EL_SPEED_PILL, FALSE,			ACTION_COLLECTING,
@@ -676,10 +760,6 @@ element_to_sound[] =
     EL_DRAGON, FALSE,				ACTION_ATTACKING,
     SND_DRAGON_ATTACKING
   },
-  {
-    EL_PLAYER_OBSOLETE, TRUE,			ACTION_DYING,
-    SND_CLASS_PLAYER_DYING
-  },
   {
     -1, -1,					-1,
     -1