rnd-20020428-3-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 528741b98b8050c61242fadcbac5be4829f595c6..335cee2329c7b391fb16aee053a089fd2da17502 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,6 @@ boolean               level_editor_test_game = FALSE;
 boolean                network_playing = FALSE;
 
 int            key_joystick_mapping = 0;
-int            global_joystick_status = JOYSTICK_STATUS;
 
 boolean                redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int            redraw_x1 = 0, redraw_y1 = 0;
@@ -137,20 +136,18 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
-/* background music */
-int background_loop[] =
+/* sound effects: setup file identifiers and corresponding default filenames */
+struct
 {
-#if 0
-  SND_ALCHEMY,
-  SND_CHASE,
-  SND_NETWORK,
-  SND_CZARDASZ,
-  SND_TYGER,
-  SND_VOYAGER,
-  SND_TWILIGHT
-#endif
+  char *identifier;
+  char *default_filename;
+}
+sound_effect[NUM_SOUND_EFFECTS] =
+{
+  { "collecting_infotron",     "infotron.wav" },
+  { "falling_zonk",            "zonkdown.wav" },
+  { "pushing_zonk",            "zonkpush.wav" }
 };
-int num_bg_loops = sizeof(background_loop)/sizeof(int);
 
 char *element_info[] =
 {