X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_snd.c;h=5d6df8a2626d14c03f56c0588c243e059034bbcd;hb=ba907500c51d4971cc9a8121c57053dbb98e4366;hp=745fdffc4067d75a3cf6c9cde2cb0d4240eec6f3;hpb=64e7c54dce6ea8c063f04198c64c5057d751c928;p=rocksndiamonds.git

diff --git a/src/conf_snd.c b/src/conf_snd.c
index 745fdffc..5d6df8a2 100644
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //     		    Holger Schemel
 //		    info@artsoft.org
-//		    http://www.artsoft.org/
+//		    https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // conf_snd.c
 // ============================================================================
@@ -13,9 +13,9 @@
 #include "main.h"
 
 
-/* List values that are not defined in the configuration file are set to
-   reliable default values. If that value is SND_ARG_UNDEFINED, it will
-   be dynamically determined, using some of the other list values. */
+// List values that are not defined in the configuration file are set to
+// reliable default values. If that value is SND_ARG_UNDEFINED, it will
+// be dynamically determined, using some of the other list values.
 
 struct ConfigTypeInfo sound_config_suffix[] =
 {
@@ -53,7 +53,9 @@ struct ConfigInfo sound_config[] =
   { "bd_amoeba.waiting",		UNDEFINED_FILENAME		},
   { "bd_amoeba.growing",		"amoebe.wav"			},
   { "bd_amoeba.turning_to_gem",		"pling.wav"			},
+  { "bd_amoeba.turning_to_gem.mode_loop", "false"			},
   { "bd_amoeba.turning_to_rock",	"klopf.wav"			},
+  { "bd_amoeba.turning_to_rock.mode_loop", "false"			},
   { "bd_butterfly.moving",		"klapper.wav"			},
   { "bd_butterfly.waiting",		"klapper.wav"			},
   { "bd_firefly.moving",		"roehr.wav"			},
@@ -202,7 +204,9 @@ struct ConfigInfo sound_config[] =
 
   // sounds for Rocks'n'Diamonds style elements and actions
   { "amoeba.turning_to_gem",		"pling.wav"			},
+  { "amoeba.turning_to_gem.mode_loop", "false"				},
   { "amoeba.turning_to_rock",		"klopf.wav"			},
+  { "amoeba.turning_to_rock.mode_loop", "false"				},
   { "speed_pill.collecting",		"pong.wav"			},
   { "dynabomb_increase_number.collecting","pong.wav"			},
   { "dynabomb_increase_size.collecting","pong.wav"			},
@@ -280,17 +284,43 @@ struct ConfigInfo sound_config[] =
   { "[mm_steel_lock].exploding",	"whoosh.wav"			},
   { "[mm_wooden_lock].exploding",	"whoosh.wav"			},
 
-  // sounds not associated to game elements (used for menu screens etc.)
+
+  // ==========================================================================
+  // sound definitions not associated with game elements (menu screens etc.)
+  // ==========================================================================
+
   // keyword to stop parser: "NO_MORE_ELEMENT_SOUNDS" <-- do not change!
 
+  // sounds for Boulder Dash style elements and actions
+  { "bd_diamond.impact.RANDOM_1",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_2",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_3",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_4",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_5",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_6",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_7",	UNDEFINED_FILENAME		},
+  { "bd_diamond.impact.RANDOM_8",	UNDEFINED_FILENAME		},
+
   // sounds for other game actions
   { "game.starting",			UNDEFINED_FILENAME		},
   { "game.leveltime_charging",		"fuel.wav"			},
   { "game.health_charging",		"warnton.wav"			},
   { "game.running_out_of_time",		"gong.wav"			},
+  { "game.running_out_of_time_10",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_9",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_8",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_7",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_6",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_5",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_4",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_3",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_2",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_1",	UNDEFINED_FILENAME		},
+  { "game.running_out_of_time_0",	UNDEFINED_FILENAME		},
   { "game.leveltime_bonus",		"sirr.wav"			},
   { "game.health_bonus",		"sirr.wav"			},
-  { "game.losing",			"lachen.wav"			},
+  { "game.timeout",			UNDEFINED_FILENAME		},
+  { "game.losing",			UNDEFINED_FILENAME		},
   { "game.winning",			UNDEFINED_FILENAME		},
   { "game.sokoban_solving",		"buing.wav"			},
 
@@ -315,12 +345,18 @@ struct ConfigInfo sound_config[] =
   { "background.TITLE_INITIAL",		UNDEFINED_FILENAME		},
   { "background.TITLE",			UNDEFINED_FILENAME		},
   { "background.MAIN",			UNDEFINED_FILENAME		},
+  { "background.NAMES",			UNDEFINED_FILENAME		},
   { "background.LEVELS",		UNDEFINED_FILENAME		},
   { "background.LEVELNR",		UNDEFINED_FILENAME		},
   { "background.SCORES",		"halloffame.wav"		},
   { "background.SCORES.mode_loop",	"false"				},
   { "background.EDITOR",		UNDEFINED_FILENAME		},
   { "background.INFO",			UNDEFINED_FILENAME		},
+  { "background.INFO[ELEMENTS]",	UNDEFINED_FILENAME		},
+  { "background.INFO[CREDITS]",		UNDEFINED_FILENAME		},
+  { "background.INFO[PROGRAM]",		UNDEFINED_FILENAME		},
+  { "background.INFO[VERSION]",		UNDEFINED_FILENAME		},
+  { "background.INFO[LEVELSET]",	UNDEFINED_FILENAME		},
   { "background.SETUP",			UNDEFINED_FILENAME		},
 
   { "background.titlescreen_initial_1",	UNDEFINED_FILENAME		},
@@ -344,5 +380,17 @@ struct ConfigInfo sound_config[] =
   { "background.titlemessage_4",	UNDEFINED_FILENAME		},
   { "background.titlemessage_5",	UNDEFINED_FILENAME		},
 
+
+  // ==========================================================================
+  // non-sound definitions
+  // ==========================================================================
+
+  // the following directives are not associated with a sound, but
+  // probably make sense to be defined in "soundsinfo.conf", too
+
+  // keyword to start parser: "CONFIG_VARS_START" <-- do not change!
+
+  { "game.use_native_bd_sound_engine",	"false"				},
+
   { NULL,				NULL				}
 };