From 629066f376eff856976b4551f30b45f4568e1631 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Mon, 23 May 2022 21:49:03 +0300 Subject: [PATCH] Add compatibility layer for "witnesstestimony" in courtroom_sounds.ini because bubbles and buttons have no underscore, yet courtroom_design.ini does (#756) --- src/courtroom.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 21d1acc..d4e67e7 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3993,12 +3993,18 @@ void Courtroom::handle_wtce(QString p_wtce, int variant) return; } sfx_name = ao_app->get_court_sfx("witness_testimony", bg_misc); + if (sfx_name == "") { + sfx_name = ao_app->get_court_sfx("witnesstestimony", bg_misc); + } filename = "witnesstestimony_bubble"; ui_vp_testimony->load_image("testimony", "", bg_misc); } // cross examination else if (p_wtce == "testimony2") { - sfx_name = ao_app->get_court_sfx("cross_examination", bg_misc); + sfx_name = ao_app->get_court_sfx("cross_examination", bg_misc); + if (sfx_name == "") { + sfx_name = ao_app->get_court_sfx("crossexamination", bg_misc); + } filename = "crossexamination_bubble"; ui_vp_testimony->kill(); } @@ -4009,6 +4015,9 @@ void Courtroom::handle_wtce(QString p_wtce, int variant) if (p_wtce == "judgeruling") { if (variant == 0) { sfx_name = ao_app->get_court_sfx("not_guilty", bg_misc); + if (sfx_name == "") { + sfx_name = ao_app->get_court_sfx("notguilty", bg_misc); + } filename = "notguilty_bubble"; ui_vp_testimony->kill(); }