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

Add compatibility layer for "witnesstestimony" in courtroom_sounds.ini because bubbles and buttons have no underscore, yet courtroom_design.ini does (#756)

Browse Source
This commit is contained in:
Crystalwarrior 2022-05-23 21:49:03 +03:00 committed by GitHub
parent 967e6a00ff
commit 629066f376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/courtroom.cpp
View File

@ -3993,12 +3993,18 @@ void Courtroom::handle_wtce(QString p_wtce, int variant)
return; return;
} }
sfx_name = ao_app->get_court_sfx("witness_testimony", bg_misc); 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"; filename = "witnesstestimony_bubble";
ui_vp_testimony->load_image("testimony", "", bg_misc); ui_vp_testimony->load_image("testimony", "", bg_misc);
} }
// cross examination // cross examination
else if (p_wtce == "testimony2") { 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"; filename = "crossexamination_bubble";
ui_vp_testimony->kill(); ui_vp_testimony->kill();
} }
@ -4009,6 +4015,9 @@ void Courtroom::handle_wtce(QString p_wtce, int variant)
if (p_wtce == "judgeruling") { if (p_wtce == "judgeruling") {
if (variant == 0) { if (variant == 0) {
sfx_name = ao_app->get_court_sfx("not_guilty", bg_misc); 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"; filename = "notguilty_bubble";
ui_vp_testimony->kill(); ui_vp_testimony->kill();
} }