From 06e8f82c878c91c75d93ef440505614bc1868bf8 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Thu, 7 Jul 2022 13:59:50 +0300 Subject: [PATCH] Support for DRO's sounds.ini as a fallback if soundlist.ini is not found for the character (#731) * Support for DRO's sounds.ini as a fallback if soundlist.ini is not found for the character * readability i guess? Co-authored-by: oldmud0 Co-authored-by: stonedDiscord Co-authored-by: oldmud0 --- src/courtroom.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index fe3517d..da89116 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -4509,6 +4509,12 @@ void Courtroom::set_sfx_dropdown() sound_list = ao_app->get_list_file( ao_app->get_character_path(current_char, "soundlist.ini")); + // If AO2 sound list is empty, try to find the DRO one. + if (sound_list.isEmpty()) { + sound_list = ao_app->get_list_file( + ao_app->get_character_path(current_char, "sounds.ini")); + } + // Append default sound list after the character sound list. sound_list += ao_app->get_list_file( ao_app->get_base_path() + "soundlist.ini"); @@ -4574,6 +4580,10 @@ void Courtroom::on_sfx_play_clicked() void Courtroom::on_sfx_edit_requested() { QString p_path = ao_app->get_real_path(ao_app->get_character_path(current_char, "soundlist.ini")); + if (!file_exists(p_path)) { + p_path = ao_app->get_real_path(ao_app->get_character_path(current_char, "sounds.ini")); + } + if (!file_exists(p_path)) { p_path = ao_app->get_base_path() + "soundlist.ini"; }