From 90e9d6d57c0d86b64f3dc96352b23b77ed424475 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 16 Jul 2006 03:14:03 +0000 Subject: [PATCH] Don't clamp to 3 seconds. --- stepmania/src/LyricDisplay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/LyricDisplay.cpp b/stepmania/src/LyricDisplay.cpp index ffa7338874..146fba5dad 100644 --- a/stepmania/src/LyricDisplay.cpp +++ b/stepmania/src/LyricDisplay.cpp @@ -55,7 +55,7 @@ void LyricDisplay::Update( float fDeltaTime ) if( GAMESTATE->m_fMusicSeconds < fStartTime ) return; - /* Clamp this lyric to the beginning of the next, the end of the music, or 3 seconds. */ + /* Clamp this lyric to the beginning of the next or the end of the music. */ float fEndTime; if( m_iCurLyricNumber+1 < GAMESTATE->m_pCurSong->m_LyricSegments.size() ) fEndTime = pSong->m_LyricSegments[m_iCurLyricNumber+1].m_fStartTime; @@ -68,7 +68,7 @@ void LyricDisplay::Update( float fDeltaTime ) /* If it's negative, two lyrics are so close together that there's no time * to tween properly. Lyrics should never be this brief, anyway, so just * skip it. */ - float fShowLength = clamp( fDistance - fTweenBufferTime, 0.0f, 3.0f ); + float fShowLength = max( fDistance - fTweenBufferTime, 0.0f ); // Make lyrics show faster for faster song rates. fShowLength /= GAMESTATE->m_SongOptions.m_fMusicRate;