Windows build fixes and warning avoidance

This commit is contained in:
Jack Andersen
2018-05-24 20:37:27 -10:00
parent e3c936648b
commit 77c7daa67c
8 changed files with 20 additions and 25 deletions

View File

@@ -174,7 +174,7 @@ void Sequencer::advance(double dt)
float vol;
if (m_curVol < m_volFadeTarget)
vol = std::min(m_volFadeTarget, m_curVol + step);
else if (m_curVol >= m_volFadeTarget)
else
vol = std::max(m_volFadeTarget, m_curVol - step);
if (vol == m_volFadeTarget)
m_volFadeTime = 0.f;