This commit is contained in:
Glenn Maynard
2007-04-29 00:02:37 +00:00
parent 9e26ff0fe1
commit b07a3d75d0
+3 -3
View File
@@ -1776,7 +1776,7 @@ void ScreenGameplay::Update( float fDeltaTime )
float ScreenGameplay::GetHasteRate()
{
if( GAMESTATE->m_fMusicSeconds < GAMESTATE->m_fLastHasteUpdateMusicSeconds || // new song
GAMESTATE->m_fMusicSeconds > GAMESTATE->m_fLastHasteUpdateMusicSeconds + 4 )
GAMESTATE->m_fMusicSeconds > GAMESTATE->m_fLastHasteUpdateMusicSeconds + 6 )
{
bool bAnyPlayerHitAllNotes = false;
FOREACH_EnabledPlayerInfo( m_vPlayerInfo, pi )
@@ -1794,7 +1794,7 @@ float ScreenGameplay::GetHasteRate()
}
if( bAnyPlayerHitAllNotes )
GAMESTATE->m_fHasteRate += 0.05f;
GAMESTATE->m_fHasteRate += 0.075f;
CLAMP( GAMESTATE->m_fHasteRate, -1.0f, +1.0f );
GAMESTATE->m_fLastHasteUpdateMusicSeconds = GAMESTATE->m_fMusicSeconds;
@@ -1816,7 +1816,7 @@ float ScreenGameplay::GetHasteRate()
if( GAMESTATE->m_fHasteRate < 0 )
fSpeed = SCALE( GAMESTATE->m_fHasteRate, -1.0f, 0.0f, 0.5f, 1.0f );
else
fSpeed = SCALE( GAMESTATE->m_fHasteRate, 0.0f, 1.0f, 1.0f, 1.6f );
fSpeed = SCALE( GAMESTATE->m_fHasteRate, 0.0f, 1.0f, 1.0f, 1.5f );
fSpeed *= GAMESTATE->m_SongOptions.GetCurrent().m_fHaste;
if( GAMESTATE->m_fAccumulatedHasteSeconds <= 1 )