X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a7cc5858fdb9bff09810f9ccb682b1b1bf13062a;hb=9c6293f12f9dea224bff9050050253e9f52e3819;hp=198caa745c67ac5f33ef92165cd03b850efd3c2e;hpb=90620849f8c48a86c5f76233501672fbbeb8aa08;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 198caa74..a7cc5858 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,16 +136,7 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
-/* 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 */
-};
-
-struct SoundEffectInfo sound_effects_NEW[] =
+struct SoundEffectInfo sound_effects[] =
 {
   /* sounds for Boulder Dash style elements and actions */
   { "bd_empty_space.digging",		"empty.wav"		},
@@ -177,7 +168,7 @@ struct SoundEffectInfo sound_effects_NEW[] =
   { "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	},
@@ -223,19 +214,25 @@ struct SoundEffectInfo sound_effects_NEW[] =
   { "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"		},
 
   /* sounds for Emerald Mine Club style elements and actions */
-  { "balloon.moving",			"schlurf.wav"		},
+  { "balloon.moving",			SND_FILE_UNDEFINED	},
+  { "balloon.pushing",			"schlurf.wav"		},
+  { "spring.moving",			SND_FILE_UNDEFINED	},
   { "spring.pushing",			"pusch.wav"		},
+  { "spring.impact",			"klopf.wav"		},
   { "wall.growing",			SND_FILE_UNDEFINED	},
 
   /* sounds for Diamond Caves style elements and actions */
   { "pearl.collecting",			"pong.wav"		},
   { "pearl.breaking",			"knack.wav"		},
+  { "pearl.impact",			"pling.wav"		},
   { "crystal.collecting",		"pong.wav"		},
+  { "crystal.impact",			"pling.wav"		},
   { "envelope.collecting",		"pong.wav"		},
   { "sand_invisible.digging",		"schlurf.wav"		},
   { "shield_passive.collecting",	"pong.wav"		},
@@ -256,8 +253,8 @@ struct SoundEffectInfo sound_effects_NEW[] =
   { "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"		},
@@ -285,22 +282,26 @@ struct SoundEffectInfo sound_effects_NEW[] =
   { "biomaze.growing",			"amoebe.wav"		},
   { "pacman.moving",			SND_FILE_UNDEFINED	},
   { "pacman.eating_amoeba",		SND_FILE_UNDEFINED	},
+  { "dark_yamyam.moving",		SND_FILE_UNDEFINED	},
+  { "dark_yamyam.waiting",		"njam.wav"		},
   { "dark_yamyam.eating_any",		SND_FILE_UNDEFINED	},
   { "penguin.moving",			SND_FILE_UNDEFINED	},
   { "penguin.entering_exit",		"buing.wav"		},
   { "pig.moving",			SND_FILE_UNDEFINED	},
   { "pig.eating_gem",			SND_FILE_UNDEFINED	},
-  { "dragon.moving",		SND_FILE_UNDEFINED	},
+  { "dragon.moving",			SND_FILE_UNDEFINED	},
   { "dragon.breathing_fire",		SND_FILE_UNDEFINED	},
 
   /* sounds for generic elements and actions */
-  { "player.screaming",			"autsch.wav"		},
+  { "player.dying",			"autsch.wav"		},
   { "element.exploding",		"roaaar.wav"		},
 
   /* sounds for other game actions */
+  { "game.starting",			SND_FILE_UNDEFINED	},
   { "game.running_out_of_time",		"gong.wav"		},
   { "game.leveltime_bonus",		"sirr.wav"		},
-  { "game.laughing_at_player",		"lachen.wav"		},
+  { "game.losing",			"lachen.wav"		},
+  { "game.winning",			SND_FILE_UNDEFINED	},
 
   /* sounds for other non-game actions */
   { "menu.door_opening",		"oeffnen.wav"		},
@@ -329,7 +330,6 @@ struct SoundEffectInfo sound_effects_NEW[] =
   { "[not used]",			"warnton.wav"		},
   { "[not used]",			"whoosh.wav"		},
   { "[not used]",			"boom.wav"		},
-  { "[not used]",			"exit.wav"		},
 #endif
 };