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

Fix compile errors from merge

Browse Source
This commit is contained in:
oldmud0 2020-05-22 21:14:37 -05:00
parent 392cefbee4
commit 75453510e0
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/aoapplication.h
View File

@ -100,9 +100,9 @@ public:
//////////////////versioning/////////////// //////////////////versioning///////////////
const int get_release() const { return RELEASE; } int get_release() const { return RELEASE; }
const int get_major_version() const { return MAJOR_VERSION; } int get_major_version() const { return MAJOR_VERSION; }
const int get_minor_version() const { return MINOR_VERSION; } int get_minor_version() const { return MINOR_VERSION; }
QString get_version_string(); QString get_version_string();
/////////////////////////////////////////// ///////////////////////////////////////////

6
src/aoblipplayer.cpp
View File

@ -22,7 +22,7 @@ void AOBlipPlayer::set_blips(QString p_sfx)
FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE); FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE);
} }
set_volume(m_volume); set_volume_internal(m_volume);
} }
void AOBlipPlayer::blip_tick() void AOBlipPlayer::blip_tick()
@ -44,7 +44,9 @@ void AOBlipPlayer::blip_tick()
void AOBlipPlayer::set_volume(int p_value) 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) void AOBlipPlayer::set_volume_internal(qreal p_value)
{ {

2
src/aosfxplayer.cpp
View File

@ -86,7 +86,7 @@ void AOSfxPlayer::set_volume(qreal p_value)
set_volume_internal(m_volume); 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); float volume = static_cast<float>(p_value);
for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) { for (int n_stream = 0; n_stream < m_channelmax; ++n_stream) {