Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sound in the sound list using the alias of the sound list as the sound instead of its actual reference (#708)

Browse Source
This commit is contained in:
Crystalwarrior 2022-05-21 17:06:07 +03:00 committed by GitHub
parent 6d1c8fd560
commit 1544d5d3a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/courtroom.cpp
View File

@ -4517,7 +4517,7 @@ void Courtroom::set_sfx_dropdown()
// Append default sound list after the character sound list. // Append default sound list after the character sound list.
sound_list += ao_app->get_list_file( sound_list += ao_app->get_list_file(
ao_app->get_base_path() + "soundlist.ini"); ao_app->get_base_path() + "soundlist.ini");
QStringList display_sounds; QStringList display_sounds;
for (const QString &sound : qAsConst(sound_list)) { for (const QString &sound : qAsConst(sound_list)) {
@ -4540,10 +4540,10 @@ void Courtroom::set_sfx_dropdown()
void Courtroom::on_sfx_dropdown_changed(int p_index) void Courtroom::on_sfx_dropdown_changed(int p_index)
{ {
custom_sfx = "";
ui_ic_chat_message->setFocus(); ui_ic_chat_message->setFocus();
if (p_index == 0) { if (p_index == 0) {
ui_sfx_remove->hide(); ui_sfx_remove->hide();
custom_sfx = "";
} }
} }
@ -4692,8 +4692,9 @@ QString Courtroom::get_char_sfx()
if (index == 0) { // Default if (index == 0) { // Default
return ao_app->get_sfx_name(current_char, current_emote); return ao_app->get_sfx_name(current_char, current_emote);
} }
if (index == 1) // Nothing if (index == 1) { // Nothing
return "1"; return "1";
}
QString sfx = sound_list[index-2].split("=")[0].trimmed(); QString sfx = sound_list[index-2].split("=")[0].trimmed();
if (sfx == "") if (sfx == "")
return "1"; return "1";