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

"temporarily" simplify code by stripping long since botched and unused AO1 backwards compatibility

Browse Source
This commit is contained in:
Crystalwarrior 2019-11-04 17:14:46 +03:00
parent 9939637dda
commit 886ec26e20
1 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/courtroom.cpp
View File

@ -2702,18 +2702,12 @@ void Courtroom::set_scene(QString f_desk_mod, QString f_side)
if (f_side == "def" && file_exists(ao_app->get_image_suffix(ao_app->get_background_path("defenseempty")))) if (f_side == "def" && file_exists(ao_app->get_image_suffix(ao_app->get_background_path("defenseempty"))))
{ {
f_background = "defenseempty"; f_background = "defenseempty";
if (is_ao2_bg)
f_desk_image = "defensedesk"; f_desk_image = "defensedesk";
else
f_desk_image = "bancodefensa";
} }
else if (f_side == "pro" && file_exists(ao_app->get_image_suffix(ao_app->get_background_path("prosecutorempty")))) else if (f_side == "pro" && file_exists(ao_app->get_image_suffix(ao_app->get_background_path("prosecutorempty"))))
{ {
f_background = "prosecutorempty"; f_background = "prosecutorempty";
if (is_ao2_bg)
f_desk_image = "prosecutiondesk"; f_desk_image = "prosecutiondesk";
else
f_desk_image = "bancoacusacion";
} }
else if (f_side == "jud" && file_exists(ao_app->get_image_suffix(ao_app->get_background_path("judgestand")))) else if (f_side == "jud" && file_exists(ao_app->get_image_suffix(ao_app->get_background_path("judgestand"))))
{ {
@ -2740,13 +2734,6 @@ void Courtroom::set_scene(QString f_desk_mod, QString f_side)
f_background = "seancestand"; f_background = "seancestand";
f_desk_image = "seancedesk"; f_desk_image = "seancedesk";
} }
else
{
if (is_ao2_bg)
f_desk_image = "stand";
else
f_desk_image = "estrado";
}
if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(f_side)))) //Unique pos path if (file_exists(ao_app->get_image_suffix(ao_app->get_background_path(f_side)))) //Unique pos path
{ {
@ -2766,26 +2753,11 @@ void Courtroom::set_scene(QString f_desk_mod, QString f_side)
ui_vp_desk->hide(); ui_vp_desk->hide();
ui_vp_legacy_desk->hide(); ui_vp_legacy_desk->hide();
} }
else if (is_ao2_bg || (f_side == "jud" || else
f_side == "hld" ||
f_side == "hlp"))
{ {
ui_vp_legacy_desk->hide(); ui_vp_legacy_desk->hide();
ui_vp_desk->show(); ui_vp_desk->show();
} }
else
{
if (f_side == "wit")
{
ui_vp_desk->show();
ui_vp_legacy_desk->hide();
}
else
{
ui_vp_desk->hide();
ui_vp_legacy_desk->show();
}
}
} }
void Courtroom::set_ip_list(QString p_list) void Courtroom::set_ip_list(QString p_list)