X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_mus.c;h=94aad15ff5bcef23230745279877d2bb2316a129;hp=469c7ed90900c2b4eb8cc9077786426ee085d516;hb=5f9b6d3b52c7f8dc10c01782d466a1e8f5ca5f26;hpb=92989af5d5884cbc8a1a9a62c9d05e109eaf78d0

diff --git a/src/conf_mus.c b/src/conf_mus.c
index 469c7ed9..94aad15f 100644
--- a/src/conf_mus.c
+++ b/src/conf_mus.c
@@ -1,44 +1,66 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* conf_mus.c                                               *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// conf_mus.c
+// ============================================================================
 
 #include "libgame/libgame.h"
 #include "main.h"
 
 
-/* List values that are not defined in the configuration file are set to
-   reliable default values. If that value is MUS_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 MUS_ARG_UNDEFINED, it will
+// be dynamically determined, using some of the other list values.
 
-struct ConfigInfo music_config_suffix[] =
+struct ConfigTypeInfo music_config_suffix[] =
 {
-  { ".mode_loop",			ARG_UNDEFINED,	TYPE_BOOLEAN },
+  { ".mode_loop",			ARG_UNDEFINED,	TYPE_BOOLEAN	},
 
-  { NULL,				NULL,		0	     }
+  { NULL,				NULL,		0		}
 };
 
 struct ConfigInfo music_config[] =
 {
-  { "background",			UNDEFINED_FILENAME	},
-  { "background.MAIN",			UNDEFINED_FILENAME	},
-  { "background.LEVELS",		UNDEFINED_FILENAME	},
-  { "background.SCORES",		UNDEFINED_FILENAME	},
-  { "background.EDITOR",		UNDEFINED_FILENAME	},
-  { "background.INFO",			"rhythmloop.wav"	},
-  { "background.SETUP",			UNDEFINED_FILENAME	},
-
-  /* there is no definition for "background.PLAYING", because this would
-     prevent selecting music from music directory that is not defined in
-     "musicinfo.conf", when no default music is defined here */
-
-  { NULL,				NULL			}
+  { "background",			UNDEFINED_FILENAME		},
+  { "background.TITLE_INITIAL",		UNDEFINED_FILENAME		},
+  { "background.TITLE",			UNDEFINED_FILENAME		},
+  { "background.MAIN",			UNDEFINED_FILENAME		},
+  { "background.LEVELS",		UNDEFINED_FILENAME		},
+  { "background.LEVELNR",		UNDEFINED_FILENAME		},
+  { "background.SCORES",		UNDEFINED_FILENAME		},
+  { "background.EDITOR",		UNDEFINED_FILENAME		},
+  { "background.INFO",			"rhythmloop.wav"		},
+  { "background.SETUP",			UNDEFINED_FILENAME		},
+
+  { "background.titlescreen_initial_1",	UNDEFINED_FILENAME		},
+  { "background.titlescreen_initial_2",	UNDEFINED_FILENAME		},
+  { "background.titlescreen_initial_3",	UNDEFINED_FILENAME		},
+  { "background.titlescreen_initial_4",	UNDEFINED_FILENAME		},
+  { "background.titlescreen_initial_5",	UNDEFINED_FILENAME		},
+  { "background.titlescreen_1",		UNDEFINED_FILENAME		},
+  { "background.titlescreen_2",		UNDEFINED_FILENAME		},
+  { "background.titlescreen_3",		UNDEFINED_FILENAME		},
+  { "background.titlescreen_4",		UNDEFINED_FILENAME		},
+  { "background.titlescreen_5",		UNDEFINED_FILENAME		},
+  { "background.titlemessage_initial_1",UNDEFINED_FILENAME		},
+  { "background.titlemessage_initial_2",UNDEFINED_FILENAME		},
+  { "background.titlemessage_initial_3",UNDEFINED_FILENAME		},
+  { "background.titlemessage_initial_4",UNDEFINED_FILENAME		},
+  { "background.titlemessage_initial_5",UNDEFINED_FILENAME		},
+  { "background.titlemessage_1",	UNDEFINED_FILENAME		},
+  { "background.titlemessage_2",	UNDEFINED_FILENAME		},
+  { "background.titlemessage_3",	UNDEFINED_FILENAME		},
+  { "background.titlemessage_4",	UNDEFINED_FILENAME		},
+  { "background.titlemessage_5",	UNDEFINED_FILENAME		},
+
+  // there is no definition for "background.PLAYING", because this would
+  // prevent selecting music from music directory that is not defined in
+  // "musicinfo.conf", when no default music is defined here
+
+  { NULL,				NULL				}
 };