X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_mus.c;h=1c29c617d7d4ed6ebd65acec197d9b55b36cac61;hb=891c39ca37c4fea5f6cc4ca40f913a56c68ef495;hp=6fe7f9da1502414f8c484584d7653bfb23626393;hpb=3607ef8e4000754063935d908053d564de92c0a2;p=rocksndiamonds.git diff --git a/src/conf_mus.c b/src/conf_mus.c index 6fe7f9da..1c29c617 100644 --- a/src/conf_mus.c +++ b/src/conf_mus.c @@ -21,21 +21,24 @@ struct ConfigInfo 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 }, - { "background.PLAYING", UNDEFINED_FILENAME }, - - { NULL, NULL } + { "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 } };