X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2s.c;h=bdcb6ac8f49f874313d1a83fde5473dfe4a6bcd2;hb=cb8b58732432cc7f3163446dedd54c63126b23c3;hp=9aa8ae90776b5fc90d8c5f66f5b21bad0049004f;hpb=3d61828b9abe5cf5e6cd4bd31582c46ebb25ce6f;p=rocksndiamonds.git

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index 9aa8ae90..bdcb6ac8 100644
--- a/src/conf_e2s.c
+++ b/src/conf_e2s.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -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
   },
   {
@@ -372,6 +376,26 @@ element_to_sound[] =
     EL_MAGIC_WALL, FALSE,			ACTION_FILLING,
     SND_MAGIC_WALL_FILLING
   },
+  {
+    EL_DC_MAGIC_WALL, FALSE,			ACTION_ACTIVATING,
+    SND_DC_MAGIC_WALL_ACTIVATING
+  },
+  {
+    EL_DC_MAGIC_WALL_ACTIVE, FALSE,		-1,
+    SND_DC_MAGIC_WALL_ACTIVE
+  },
+  {
+    EL_DC_MAGIC_WALL, FALSE,			ACTION_ACTIVE,
+    SND_DC_MAGIC_WALL_ACTIVE
+  },
+  {
+    EL_DC_MAGIC_WALL_FILLING, FALSE,		-1,
+    SND_DC_MAGIC_WALL_FILLING
+  },
+  {
+    EL_DC_MAGIC_WALL, FALSE,			ACTION_FILLING,
+    SND_DC_MAGIC_WALL_FILLING
+  },
   {
     EL_AMOEBA_DEAD, TRUE,			ACTION_WAITING,
     SND_CLASS_AMOEBA_WAITING
@@ -384,6 +408,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
@@ -404,6 +432,42 @@ element_to_sound[] =
     EL_EXIT_CLOSED, TRUE,			ACTION_PASSING,
     SND_CLASS_EXIT_PASSING
   },
+  {
+    EL_STEEL_EXIT_CLOSED, TRUE,			ACTION_OPENING,
+    SND_CLASS_STEEL_EXIT_OPENING
+  },
+  {
+    EL_STEEL_EXIT_CLOSED, TRUE,			ACTION_CLOSING,
+    SND_CLASS_STEEL_EXIT_CLOSING
+  },
+  {
+    EL_STEEL_EXIT_CLOSED, TRUE,			ACTION_PASSING,
+    SND_CLASS_STEEL_EXIT_PASSING
+  },
+  {
+    EL_EM_EXIT_CLOSED, TRUE,			ACTION_OPENING,
+    SND_CLASS_EM_EXIT_OPENING
+  },
+  {
+    EL_EM_EXIT_CLOSED, TRUE,			ACTION_CLOSING,
+    SND_CLASS_EM_EXIT_CLOSING
+  },
+  {
+    EL_EM_EXIT_CLOSED, TRUE,			ACTION_PASSING,
+    SND_CLASS_EM_EXIT_PASSING
+  },
+  {
+    EL_EM_STEEL_EXIT_CLOSED, TRUE,		ACTION_OPENING,
+    SND_CLASS_EM_STEEL_EXIT_OPENING
+  },
+  {
+    EL_EM_STEEL_EXIT_CLOSED, TRUE,		ACTION_CLOSING,
+    SND_CLASS_EM_STEEL_EXIT_CLOSING
+  },
+  {
+    EL_EM_STEEL_EXIT_CLOSED, TRUE,		ACTION_PASSING,
+    SND_CLASS_EM_STEEL_EXIT_PASSING
+  },
   {
     EL_PENGUIN, FALSE,				ACTION_PASSING,
     SND_PENGUIN_PASSING
@@ -440,6 +504,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 +545,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
@@ -529,24 +621,20 @@ element_to_sound[] =
     SND_CLASS_SWITCHGATE_PASSING
   },
   {
-    EL_TIMEGATE_SWITCH, FALSE,			ACTION_ACTIVATING,
-    SND_TIMEGATE_SWITCH_ACTIVATING
-  },
-  {
-    EL_TIMEGATE_SWITCH_ACTIVE, FALSE,		-1,
-    SND_TIMEGATE_SWITCH_ACTIVE
+    EL_TIMEGATE_SWITCH_ACTIVE, TRUE,		ACTION_ACTIVATING,
+    SND_CLASS_TIMEGATE_SWITCH_ACTIVATING
   },
   {
-    EL_TIMEGATE_SWITCH, FALSE,			ACTION_ACTIVE,
-    SND_TIMEGATE_SWITCH_ACTIVE
+    EL_TIMEGATE_SWITCH_ACTIVE, TRUE,		ACTION_ACTIVE,
+    SND_CLASS_TIMEGATE_SWITCH_ACTIVE
   },
   {
-    EL_TIMEGATE_SWITCH, FALSE,			ACTION_DEACTIVATING,
-    SND_TIMEGATE_SWITCH_DEACTIVATING
+    EL_TIMEGATE_SWITCH_ACTIVE, TRUE,		ACTION_DEACTIVATING,
+    SND_CLASS_TIMEGATE_SWITCH_DEACTIVATING
   },
   {
-    EL_TIMEGATE_OPENING, FALSE,			-1,
-    SND_TIMEGATE_OPENING
+    EL_TIMEGATE_OPEN, TRUE,			ACTION_OPENING,
+    SND_CLASS_TIMEGATE_OPENING
   },
   {
     EL_TIMEGATE_OPEN, TRUE,			ACTION_CLOSING,