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

diff --git a/src/main.c b/src/main.c
index 198caa74..7c1ac0c5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,6 +136,7 @@ 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] =
 {
@@ -144,8 +145,9 @@ struct SoundEffectInfo sound_effects[NUM_SOUND_EFFECTS] =
   { "zonk_pushing",			"zonkpush.wav"		}, /* TEST */
   { "player_screaming",			"autsch.wav"		}  /* TEST */
 };
+#endif
 
-struct SoundEffectInfo sound_effects_NEW[] =
+struct SoundEffectInfo sound_effects[] =
 {
   /* sounds for Boulder Dash style elements and actions */
   { "bd_empty_space.digging",		"empty.wav"		},
@@ -223,19 +225,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 +264,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 +293,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"		},