From 39372432b78b3d0980b004903739539e565c0948 Mon Sep 17 00:00:00 2001 From: Osmium Sorcerer Date: Sun, 22 Mar 2026 17:34:25 +0000 Subject: Stop setting volume on evidence show Presenting evidence took volume as a parameter which it also set. It's unnecessary as the evidence uses the same SFX player, the volume of which is controlled by the player with a slider. --- src/aoevidencedisplay.cpp | 4 +--- src/aoevidencedisplay.h | 2 +- src/courtroom.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/aoevidencedisplay.cpp b/src/aoevidencedisplay.cpp index 9e33d5b..fb82a0e 100644 --- a/src/aoevidencedisplay.cpp +++ b/src/aoevidencedisplay.cpp @@ -17,13 +17,11 @@ AOEvidenceDisplay::AOEvidenceDisplay(AOApplication *p_ao_app, QWidget *p_parent) connect(ui_prompt_details, &QPushButton::clicked, this, &AOEvidenceDisplay::icon_clicked); } -void AOEvidenceDisplay::show_evidence(int p_index, QString p_evidence_image, bool is_left_side, int p_volume) +void AOEvidenceDisplay::show_evidence(int p_index, QString p_evidence_image, bool is_left_side) { QString gif_name; QString icon_identifier; - m_sfx_player->setVolume(p_volume); - if (is_left_side) { icon_identifier = "left_evidence_icon"; diff --git a/src/aoevidencedisplay.h b/src/aoevidencedisplay.h index 307f7ad..1344647 100644 --- a/src/aoevidencedisplay.h +++ b/src/aoevidencedisplay.h @@ -15,7 +15,7 @@ class AOEvidenceDisplay : public QLabel public: AOEvidenceDisplay(AOApplication *p_ao_app, QWidget *p_parent = nullptr); - void show_evidence(int p_index, QString p_evidence_image, bool is_left_side, int p_volume); + void show_evidence(int p_index, QString p_evidence_image, bool is_left_side); void reset(); void combo_resize(int w, int h); void setLastEvidenceIndex(int f_index); diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 4c6b7fb..0edef94 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3443,7 +3443,7 @@ void Courtroom::display_evidence_image() 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()); + ui_vp_evidence_display->show_evidence(f_evi_id, f_image, is_left_side); } else { -- cgit