X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=9a1b0a8b6be6709ef00f2e37dfe0bb44ae50712f;hb=0a85e6bd82e4c5c495be7201f672f788123dcb84;hp=8533d336d74f9b5479151118d3a12a00f2668bc7;hpb=e0e2697df0d0da483a91b1248c120aef6b3caf9b;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 8533d336..9a1b0a8b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,20 +136,134 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
-/* background music */
-int background_loop[] =
+/* sound effects: setup file identifiers and corresponding default filenames */
+struct SoundEffectInfo sound_effects[NUM_SOUND_EFFECTS] =
 {
+  { "infotron_collecting",	"infotron.wav"	},
+  { "zonk_falling",		"zonkdown.wav"	},
+  { "zonk_pushing",		"zonkpush.wav"	},
+  { "player_screaming",		"autsch.wav"	}
+};
+
+struct SoundEffectInfo sound_effects_NEW[] =
+{
+  { "amoeba_growing",		"amoebe.wav"	},
+  { "player_screaming",		"autsch.wav"	},
+  { "acid_splashing",		"blurb.wav"	},
+  { "mole_eating_amoeba",	"blurb.wav"	},
+  { "penguin_entering_exit",	"buing.wav"	},
+  { "player_entering_exit",	"buing.wav"	},
+  { "player_solving_sokoban",	"buing.wav"	},
+  { "time_orb_full_impact",	"deng.wav"	},
+  { "time_orb_empty_impact",	"deng.wav"	},
+  { "electric_bulb_light",	"deng.wav"	},
+  { "sokoban_field_filling",	"deng.wav"	},
+  { "leveltime_running_out",	"gong.wav"	},
+  { "extra_time_collecting",	"gong.wav"	},
+  { "time_orb_full_collecting",	"gong.wav"	},
+  { "menu_hall_of_fame",	"halloffame.wav"},
+  { "key_impact",		"kink.wav"	},
+  { "em_key_impact",		"kink.wav"	},
+  { "bug_moving",		"klapper.wav"	},
+  { "butterfly_moving",		"klapper.wav"	},
+  { "rock_impact",		"klopf.wav"	},
+  { "bd_rock_impact",		"klopf.wav"	},
+  { "amoeba_turns_to_rock",	"klopf.wav"	},
+  { "nut_impact",		"klumpf.wav"	},
+  { "pearl_breaking",		"knack.wav"	},
+  { "nut_cracking",		"knack.wav"	},
+  { "nut_pushing",		"knurk.wav"	},
+  { "player_laughing_at",	"lachen.wav"	},
+  { "robot_wheel_running",	"miep.wav"	},
+  { "timegate_wheel_running",	"miep.wav"	},
+  { "magic_wall_running",	"miep.wav"	},
+  { "yamyam_waiting",		"njam.wav"	},
+  { "menu_door",		"oeffnen.wav"	},
+  { "switchgate_opening",	"oeffnen.wav"	},
+  { "switchgate_closing",	"oeffnen.wav"	},
+  { "timegate_opening",		"oeffnen.wav"	},
+  { "timegate_closing",		"oeffnen.wav"	},
+  { "exit_opening",		"oeffnen.wav"	},
+  { "emerald_impact",		"pling.wav"	},
+  { "bd_diamond_impact",	"pling.wav"	},
+  { "diamond_impact",		"pling.wav"	},
+  { "infotron_impact",		"pling.wav"	},
+  { "amoeba_turns_to_gem",	"pling.wav"	},
+  { "emerald_collecting",	"pong.wav"	},
+  { "bd_diamond_collecting",	"pong.wav"	},
+  { "diamond_collecting",	"pong.wav"	},
+  { "pearl_collecting",		"pong.wav"	},
+  { "crystal_collecting",	"pong.wav"	},
+  { "speed_pill_collecting",	"pong.wav"	},
+  { "envelope_collecting",	"pong.wav"	},
+  { "shield_passive_collecting","pong.wav"	},
+  { "shield_active_collecting",	"pong.wav"	},
+  { "dynamite_collecting",	"pong.wav"	},
+  { "dynabomb_nr_collecting",	"pong.wav"	},
+  { "dynabomb_sz_collecting",	"pong.wav"	},
+  { "dynabomb_xl_collecting",	"pong.wav"	},
+  { "key_collecting",		"pong.wav"	},
+  { "em_key_collecting",	"pong.wav"	},
+  { "rock_pushing",		"pusch.wav"	},
+  { "bd_rock_pushing",		"pusch.wav"	},
+  { "bomb_pushing",		"pusch.wav"	},
+  { "dx_supabomb_pushing",	"pusch.wav"	},
+  { "time_orb_empty_pushing",	"pusch.wav"	},
+  { "spring_pushing",		"pusch.wav"	},
+  { "sokoban_object_pushing",	"pusch.wav"	},
+  { "satellite_pushing",	"pusch.wav"	},
+  { "sp_disk_yellow_pushing",	"pusch.wav"	},
+  { "diamond_smashing",		"quirk.wav"	},
+  { "magic_wall_activating",	"quirk.wav"	},
+  { "menu_info_screen",		"rhythmloop.wav"},
+  { "explosion",		"roaaar.wav"	},
+  { "spaceship_moving",		"roehr.wav"	},
+  { "firefly_moving",		"roehr.wav"	},
+  { "robot_moving",		"schlurf.wav"	},
+  { "sand_digging",		"schlurf.wav"	},
+  { "sand_invisible_digging",	"schlurf.wav"	},
+  { "trap_inactive_digging",	"schlurf.wav"	},
+  { "balloon_moving",		"schlurf.wav"	},
+  { "leveltime_bonus",		"sirr.wav"	},
+  { "dynamite_burning",		"zisch.wav"	},
+  { "sp_base_digging",		"base.wav"	},
+  { "sp_buggy_base_digging",	"base.wav"	},
+  { "sp_infotron_collecting",	"infotron.wav"	},
+  { "sp_disk_red_collecting",	"infotron.wav"	},
+  { "sp_zonk_impact",		"zonkdown.wav"	},
+  { "sp_zonk_pushing",		"zonkpush.wav"	},
+  { "sp_disk_orange_pushing",	"zonkpush.wav"	},
+  { "sp_buggy_base_passing",	"bug.wav"	},
+  { "sp_explosion",		"booom.wav"	},
+  { "empty_space_digging",	"empty.wav"	},
+  { "em_gate_passing",		"gate.wav"	},
+  { "switchgate_passing",	"gate.wav"	},
+  { "timegate_passing",		"gate.wav"	},
+  { "sp_port_passing",		"gate.wav"	}
+
 #if 0
-  SND_ALCHEMY,
-  SND_CHASE,
-  SND_NETWORK,
-  SND_CZARDASZ,
-  SND_TYGER,
-  SND_VOYAGER,
-  SND_TWILIGHT
+  { "[not used]",		"antigrav.wav"	},
+  { "[not used]",		"bong.wav"	},
+  { "[not used]",	 	"fuel.wav"	},
+  { "[not used]",		"holz.wav"	},
+  { "[not used]",		"hui.wav"	},
+  { "[not used]",		"kabumm.wav"	},
+  { "[not used]",		"kling.wav"	},
+  { "[not used]",		"krach.wav"	},
+  { "[not used]",		"laser.wav"	},
+  { "[not used]",		"quiek.wav"	},
+  { "[not used]",		"rumms.wav"	},
+  { "[not used]",		"schlopp.wav"	},
+  { "[not used]",		"schrff.wav"	},
+  { "[not used]",		"schwirr.wav"	},
+  { "[not used]",		"slurp.wav"	},
+  { "[not used]",		"sproing.wav"	},
+  { "[not used]",		"warnton.wav"	},
+  { "[not used]",		"whoosh.wav"	},
+  { "[not used]",		"boom.wav"	},
+  { "[not used]",		"exit.wav"	},
 #endif
 };
-int num_bg_loops = sizeof(background_loop)/sizeof(int);
 
 char *element_info[] =
 {