X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=460bed15cb4ef98dff342bd63e386392c2fc6cae;hp=1a403e7be7c60ccfd53b0a2b614af3c41f1dd237;hb=7b47ce7ba0f673f0de5130daf5726104d0b38902;hpb=ee0895b12e544444db37febb1242bcc8a72d6ad8 diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 1a403e7b..460bed15 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1770,9 +1770,10 @@ struct FileInfo *getCurrentSoundList() return sound_info->file_list; } -void InitSoundList(struct ConfigInfo *config_list, +void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries, struct ConfigInfo *config_suffix_list, - int num_file_list_entries) + struct ConfigInfo *ext1_suffix_list, + struct ConfigInfo *ext2_suffix_list) { int i; @@ -1781,14 +1782,25 @@ void InitSoundList(struct ConfigInfo *config_list, sound_info->type = ARTWORK_TYPE_SOUNDS; sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_suffix_list_entries = 0; for (i=0; config_suffix_list[i].token != NULL; i++) sound_info->num_suffix_list_entries++; + sound_info->num_ext1_suffix_list_entries = 0; + for (i=0; ext1_suffix_list[i].token != NULL; i++) + sound_info->num_ext1_suffix_list_entries++; + + sound_info->num_ext2_suffix_list_entries = 0; + for (i=0; ext2_suffix_list[i].token != NULL; i++) + sound_info->num_ext2_suffix_list_entries++; + sound_info->file_list = getFileListFromConfigList(config_list, config_suffix_list, num_file_list_entries); sound_info->suffix_list = config_suffix_list; + sound_info->ext1_suffix_list = ext1_suffix_list; + sound_info->ext2_suffix_list = ext2_suffix_list; sound_info->custom_setup_list = NULL; sound_info->artwork_list =