X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_e2s.c;h=bdcb6ac8f49f874313d1a83fde5473dfe4a6bcd2;hb=2e99b0c26d334eb287486b8933b52b5048c6cc0c;hp=ccb1060c578a65d49e11a29dc34d004ab194ccff;hpb=d8e3568accbc475855027f7199e55543dc4d1ddf;p=rocksndiamonds.git

diff --git a/src/conf_e2s.c b/src/conf_e2s.c
index ccb1060c..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                            *
@@ -376,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
@@ -388,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
@@ -408,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
@@ -444,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
@@ -545,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,