aboutsummaryrefslogtreecommitdiff
path: root/src/courtroom.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <Varsash@Gmail.com>2022-05-23 21:49:03 +0300
committerGitHub <noreply@github.com>2022-05-23 20:49:03 +0200
commit629066f376eff856976b4551f30b45f4568e1631 (patch)
tree9825d96996850e8f3248f74517c42c8cc59128af /src/courtroom.cpp
parent967e6a00ff64986f01d5292020de1face362e5cc (diff)
Add compatibility layer for "witnesstestimony" in courtroom_sounds.ini because bubbles and buttons have no underscore, yet courtroom_design.ini does (#756)
Diffstat (limited to 'src/courtroom.cpp')
-rw-r--r--src/courtroom.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 21d1accc..d4e67e7a 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();
}