Skip to content

Fix local evidence being used for message display instead of global #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
in1tiate merged 1 commit into from
Jan 23, 2025
Merged

Fix local evidence being used for message display instead of global #1073

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2619,11 +2619,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 (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;
// 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)
{
case IO_ONLY:
Expand Down Expand Up @@ -3423,11 +3423,10 @@ void Courtroom::display_evidence_image()
{
QString side = m_chatmessage[SIDE];
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
QString f_image = local_evidence_list.at(f_evi_id - 1).image;
// QString f_evi_name = local_evidence_list.at(f_evi_id - 1).name;
QString f_image = global_evidence_list.at(f_evi_id - 1).image;
// def jud and hlp should display the evidence icon on the RIGHT side
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());
Expand Down
Loading