aboutsummaryrefslogtreecommitdiff
path: root/src/aosfxplayer.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-20 05:30:07 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-20 05:30:07 +0300
commit3899dbe0bd82875214ebd676130692120f89a412 (patch)
tree785b6eec8304b34dfaef5407f40ecc1738804ef1 /src/aosfxplayer.cpp
parentdf08ec4be6ff519f82e22a7485725128999ce174 (diff)
I dunno what the fuck was I doing for the past 4 hours but I made crossfading music work.
Music packets can receive channel to play the song in and the crossfading option too.
Diffstat (limited to 'src/aosfxplayer.cpp')
-rw-r--r--src/aosfxplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/aosfxplayer.cpp b/src/aosfxplayer.cpp
index b9410c8d..ca2b3930 100644
--- a/src/aosfxplayer.cpp
+++ b/src/aosfxplayer.cpp
@@ -31,7 +31,7 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout, int channel
{
if (channel == -1)
{
- if (m_stream_list[channel] != NULL)
+ if (BASS_ChannelIsActive(m_stream_list[channel]) == BASS_ACTIVE_PLAYING)
m_channel = (m_channel + 1) % m_channelmax;
channel = m_channel;
}