X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2s.c;h=9b293d5b5424e4a3389c003425e5b260f26ee29e;hb=b645a25fff77d62a36c744fa4047a3c0e5929341;hp=76b0dab529650e497764d06734a709992f5ba361;hpb=c145af8280c5ad22978e42621bbe5c0f3a8ada3c;p=rocksndiamonds.git

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index 76b0dab5..9b293d5b 100644
--- a/src/conf_e2s.c
+++ b/src/conf_e2s.c
@@ -29,33 +29,45 @@ static struct
 element_to_sound[] =
 {
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_DIGGING,
+    EL_DEFAULT, TRUE,				ACTION_DIGGING,
     SND_CLASS_DEFAULT_DIGGING
   },
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_COLLECTING,
+    EL_DEFAULT, TRUE,				ACTION_COLLECTING,
     SND_CLASS_DEFAULT_COLLECTING
   },
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_SNAPPING,
+    EL_DEFAULT, TRUE,				ACTION_SNAPPING,
     SND_CLASS_DEFAULT_SNAPPING
   },
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_PUSHING,
+    EL_DEFAULT, TRUE,				ACTION_PUSHING,
     SND_CLASS_DEFAULT_PUSHING
   },
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_IMPACT,
+    EL_DEFAULT, TRUE,				ACTION_IMPACT,
     SND_CLASS_DEFAULT_IMPACT
   },
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_PASSING,
+    EL_DEFAULT, TRUE,				ACTION_WALKING,
+    SND_CLASS_DEFAULT_WALKING
+  },
+  {
+    EL_DEFAULT, TRUE,				ACTION_PASSING,
     SND_CLASS_DEFAULT_PASSING
   },
   {
-    EL_INTERNAL_DEFAULT_ELEMENT, TRUE,		ACTION_EXPLODING,
+    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
@@ -172,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
@@ -213,20 +229,20 @@ element_to_sound[] =
     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,
@@ -285,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
   },
   {
@@ -384,6 +400,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
@@ -449,8 +469,16 @@ 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,
@@ -573,8 +601,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,
@@ -708,10 +736,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