rnd-20050307-1-src

[rocksndiamonds.git] / src / conf_e2s.c

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index 9aa8ae90776b5fc90d8c5f66f5b21bad0049004f..825dc7a687bd840b147cfbcb18fa1498e5ab749e 100644 (file)
--- a/src/conf_e2s.c
+++ b/src/conf_e2s.c
@@ -184,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,19 +217,19 @@ 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_PLAYER_OBSOLETE, TRUE,                  ACTION_MOVING,
+    EL_PLAYER_1, TRUE,                         ACTION_MOVING,
     SND_CLASS_PLAYER_MOVING
   },
   {
@@ -233,12 +237,12 @@ element_to_sound[] =
     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,
@@ -297,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 +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
@@ -440,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
@@ -465,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