diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/aooptionsdialog.cpp | 1 | ||||
| -rw-r--r-- | src/courtroom.cpp | 17 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index 3749b65..55f7583 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -188,6 +188,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi ui_language_combobox->addItem("en - English"); ui_language_combobox->addItem("de - Deutsch"); ui_language_combobox->addItem("es - Español"); + ui_language_combobox->addItem("pt - Português"); ui_language_combobox->addItem("jp - 日本語"); ui_language_combobox->addItem("ru - Русский"); ui_gameplay_form->setWidget(11, QFormLayout::FieldRole, ui_language_combobox); diff --git a/src/courtroom.cpp b/src/courtroom.cpp index e3e8450..6e5397e 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -991,6 +991,12 @@ void Courtroom::enter_courtroom(int p_cid) QString side = ao_app->get_char_side(current_char); + // We block signals from ui_pos_dropdown to stop on_pos_dropdown_changed from firing here. + // Per the Qt docs, QSignalBlocker only affects the rest of this function, + // so it doesn't stop the dropdown from working once we finish here. + const QSignalBlocker blocker(ui_pos_dropdown); + ui_pos_dropdown->setCurrentText(side); + if (side == "jud") { ui_witness_testimony->show(); @@ -3001,8 +3007,7 @@ void Courtroom::handle_song(QStringList *p_contents) void Courtroom::handle_failed_login() { - music_player->enable_looping = false; - music_player->play("failed_login"); + modcall_player->play("./music/failed_login"); // aov memes } void Courtroom::handle_wtce(QString p_wtce, int variant) @@ -3436,7 +3441,7 @@ void Courtroom::on_pos_dropdown_changed(int p_index) { ui_ic_chat_message->setFocus(); - if (p_index < 0 || p_index > 5) + if (p_index < 0 || p_index > 7) return; toggle_judge_buttons(false); @@ -3464,6 +3469,12 @@ void Courtroom::on_pos_dropdown_changed(int p_index) case 5: f_pos = "hlp"; break; + case 6: + f_pos = "jur"; + break; + case 7: + f_pos = "sea"; + break; default: f_pos = ""; } |