rnd-20020519-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 375e74f2c10ee1b3865e6edcfa2134e9e61f568c..a7cc5858fdb9bff09810f9ccb682b1b1bf13062a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -136,17 +136,6 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
-#if 0
-/* sound effects: setup file identifiers and corresponding default filenames */
-struct SoundEffectInfo sound_effects[NUM_SOUND_EFFECTS] =
-{
-  { "infotron_collecting",             "infotron.wav"          }, /* TEST */
-  { "zonk_falling",                    SND_FILE_UNDEFINED      }, /* TEST */
-  { "zonk_pushing",                    "zonkpush.wav"          }, /* TEST */
-  { "player_screaming",                        "autsch.wav"            }  /* TEST */
-};
-#endif
-
 struct SoundEffectInfo sound_effects[] =
 {
   /* sounds for Boulder Dash style elements and actions */
@@ -179,7 +168,7 @@ struct SoundEffectInfo sound_effects[] =
   { "sp_disk_orange.pushing",          "zonkpush.wav"          },
   { "sp_disk_yellow.pushing",          "pusch.wav"             },
   { "sp_port.passing",                 "gate.wav"              },
-  { "sp_exit.entering",                        "buing.wav"             },
+  { "sp_exit.entering",                        "exit.wav"              },
   { "sp_element.exploding",            "booom.wav"             },
   { "sp_sniksnak.moving",              SND_FILE_UNDEFINED      },
   { "sp_electron.moving",              SND_FILE_UNDEFINED      },
@@ -225,6 +214,7 @@ struct SoundEffectInfo sound_effects[] =
   { "amoeba.dropping",                 SND_FILE_UNDEFINED      },
   { "acid.splashing",                  "blurb.wav"             },
   { "quicksand.filling",               SND_FILE_UNDEFINED      },
+  { "quicksand.slipping_through",      SND_FILE_UNDEFINED      },
   { "quicksand.emptying",              SND_FILE_UNDEFINED      },
   { "exit.opening",                    "oeffnen.wav"           },
   { "exit.entering",                   "buing.wav"             },
@@ -263,8 +253,8 @@ struct SoundEffectInfo sound_effects[] =
   { "timegate.passing",                        "gate.wav"              },
   { "conveyor_belt_switch.activating", SND_FILE_UNDEFINED      },
   { "conveyor_belt.running",           SND_FILE_UNDEFINED      },
-  { "light.activating",                        SND_FILE_UNDEFINED      },
-  { "light.deactivating",              SND_FILE_UNDEFINED      },
+  { "light_switch.activating",         SND_FILE_UNDEFINED      },
+  { "light_switch.deactivating",       SND_FILE_UNDEFINED      },
 
   /* sounds for DX Boulderdash style elements and actions */
   { "dx_bomb.pushing",                 "pusch.wav"             },
@@ -340,7 +330,6 @@ struct SoundEffectInfo sound_effects[] =
   { "[not used]",                      "warnton.wav"           },
   { "[not used]",                      "whoosh.wav"            },
   { "[not used]",                      "boom.wav"              },
-  { "[not used]",                      "exit.wav"              },
 #endif
 };