From 75453510e080978681ec5603e283c36638f155cc Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Fri, 22 May 2020 21:14:37 -0500
Subject: Fix compile errors from merge

---
 src/aoblipplayer.cpp | 6 ++++--
 src/aosfxplayer.cpp  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp
index 39158fd..b67f9c3 100644
--- a/src/aoblipplayer.cpp
+++ b/src/aoblipplayer.cpp
@@ -22,7 +22,7 @@ void AOBlipPlayer::set_blips(QString p_sfx)
           FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE);
   }
 
-  set_volume(m_volume);
+  set_volume_internal(m_volume);
 }
 
 void AOBlipPlayer::blip_tick()
@@ -44,7 +44,9 @@ void AOBlipPlayer::blip_tick()
 
 void AOBlipPlayer::set_volume(int p_value)
 {
-  m_volume = p_value;
+  m_volume = static_cast<qreal>(p_value) / 100;
+  set_volume_internal(m_volume);
+}
 
 void AOBlipPlayer::set_volume_internal(qreal p_value)
 {
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index 6db6f37..607d605 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -86,7 +86,7 @@ void AOSfxPlayer::set_volume(qreal p_value)
   set_volume_internal(m_volume);
 }
 
-void AOSfxPlayer::set_volume(int p_value)
+void AOSfxPlayer::set_volume_internal(qreal p_value)
 {
   float volume = static_cast<float>(p_value);
   for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) {
-- 
cgit