diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp index 0775eb9..ac3b851 100644 --- a/src/aosfxplayer.cpp +++ b/src/aosfxplayer.cpp @@ -8,7 +8,7 @@ AOSfxPlayer::AOSfxPlayer(AOApplication *ao_app) int AOSfxPlayer::volume() { - return m_volume * 100; + return m_volume; } void AOSfxPlayer::setVolume(int value) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index ab8d2c4..15fc62e 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3435,7 +3435,7 @@ void Courtroom::display_evidence_image() 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; // def jud and hlp should display the evidence icon on the RIGHT side - bool is_left_side = !(side == "def" || side == "hlp" || side == "jud" || side == "jur"); + bool is_left_side = !(side.startsWith("def") || side == "hlp"); ui_vp_evidence_display->show_evidence(f_evi_id, f_image, is_left_side, sfx_player->volume()); } }