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

Use global evidence instead of local for display (#1073)

Browse Source
This commit is contained in:
in1tiate 2025-01-23 03:17:11 -06:00 committed by GitHub
parent d333934f9b
commit 0d6b89fa1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/courtroom.cpp
View File

@ -2611,11 +2611,11 @@ void Courtroom::log_chatmessage(QString f_message, int f_char_id, QString f_show
} }
// If the evidence ID is in the valid range // If the evidence ID is in the valid range
if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) if (f_evi_id > 0 && f_evi_id <= global_evidence_list.size())
{ {
blankpost = false; blankpost = false;
// Obtain the evidence name // Obtain the evidence name
QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name; QString f_evi_name = global_evidence_list.at(f_evi_id - 1).name;
switch (f_log_mode) switch (f_log_mode)
{ {
case IO_ONLY: case IO_ONLY:
@ -3415,11 +3415,10 @@ void Courtroom::display_evidence_image()
{ {
QString side = m_chatmessage[SIDE]; QString side = m_chatmessage[SIDE];
int f_evi_id = m_chatmessage[EVIDENCE_ID].toInt(); int f_evi_id = m_chatmessage[EVIDENCE_ID].toInt();
if (f_evi_id > 0 && f_evi_id <= local_evidence_list.size()) if (f_evi_id > 0 && f_evi_id <= global_evidence_list.size())
{ {
// shifted by 1 because 0 is no evidence per legacy standards // shifted by 1 because 0 is no evidence per legacy standards
QString f_image = local_evidence_list.at(f_evi_id - 1).image; QString f_image = global_evidence_list.at(f_evi_id - 1).image;
// QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name;
// def jud and hlp should display the evidence icon on the RIGHT side // def jud and hlp should display the evidence icon on the RIGHT side
bool is_left_side = !(side.startsWith("def") || side == "hlp"); // FIXME : Hardcoded bool is_left_side = !(side.startsWith("def") || side == "hlp"); // FIXME : Hardcoded
ui_vp_evidence_display->show_evidence(f_evi_id, f_image, is_left_side, sfx_player->volume()); ui_vp_evidence_display->show_evidence(f_evi_id, f_image, is_left_side, sfx_player->volume());