summaryrefslogtreecommitdiffstats
path: root/src/sound
diff options
context:
space:
mode:
authorerihel <erihel@gmail.com>2014-02-02 02:01:42 +0100
committererihel <erihel@gmail.com>2014-02-02 02:01:42 +0100
commitf21ab91184cf5b6a97bc5ae62c49ac8ac68a8b05 (patch)
tree84e993665af2c9f99116f284cd8010f8f093b286 /src/sound
parent93582536ded303f4c9c358ef9967deb07d638e54 (diff)
downloadcolobot-f21ab91184cf5b6a97bc5ae62c49ac8ac68a8b05.tar.gz
colobot-f21ab91184cf5b6a97bc5ae62c49ac8ac68a8b05.tar.bz2
colobot-f21ab91184cf5b6a97bc5ae62c49ac8ac68a8b05.zip
Changed max channels to fix compilation error
Diffstat (limited to 'src/sound')
-rw-r--r--src/sound/oalsound/alsound.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sound/oalsound/alsound.cpp b/src/sound/oalsound/alsound.cpp
index 9ef9341..fab0445 100644
--- a/src/sound/oalsound/alsound.cpp
+++ b/src/sound/oalsound/alsound.cpp
@@ -20,7 +20,6 @@
#include <algorithm>
#include <iomanip>
-#include <algorithm>
#include <boost/filesystem.hpp>
@@ -381,7 +380,7 @@ int ALSound::Play(Sound sound, const Math::Vector &pos, float amplitude, float f
if (!m_channels[channel]->Play())
{
- m_channels_limit = std::min(m_channels.size() - 1, m_channels_limit - 1);
+ m_channels_limit = m_channels.size() - 1;
GetLogger()->Debug("Changing channel limit to %u.\n", m_channels_limit);
auto it = m_channels.find(channel);
Channel *ch = it->second;