From 3d867ad7143549a6f3505fd7388b6d361f044b70 Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Sat, 23 Oct 2004 17:29:45 +0000 Subject: [PATCH] Made more readable as per Glenn's suggestion --- stepmania/src/ScreenGameplay.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 68066f2124..3db80eeb7d 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1068,8 +1068,8 @@ void ScreenGameplay::LoadNextSong() // (Re)Calculate the song position meter m_fSongPosMeterOffset = GAMESTATE->m_pCurSong->m_Timing.GetElapsedTimeFromBeat( GAMESTATE->m_pCurSong->m_fFirstBeat ); - m_fSongPosMeterEnd = ( GAMESTATE->m_pCurSong->m_Timing.GetElapsedTimeFromBeat( - GAMESTATE->m_pCurSong->m_fLastBeat ) - m_fSongPosMeterOffset ); + m_fSongPosMeterEnd = GAMESTATE->m_pCurSong->m_Timing.GetElapsedTimeFromBeat( + GAMESTATE->m_pCurSong->m_fLastBeat ); // // Load cabinet lights data @@ -1602,8 +1602,8 @@ void ScreenGameplay::Update( float fDeltaTime ) // step sequence the players are. It looks "better" that way, showing a // song "depleting" as the players wear on. So, it starts "ticking" at // the first arrow and winds down to the very end. - float fPercentPositionSong = ( GAMESTATE->m_fMusicSeconds - m_fSongPosMeterOffset ) / - m_fSongPosMeterEnd; + float fPercentPositionSong = SCALE( GAMESTATE->m_fMusicSeconds, m_fSongPosMeterOffset, + m_fSongPosMeterEnd, 0.0f, 1.0f ); CLAMP( fPercentPositionSong, 0, 1 ); m_meterSongPosition.SetPercent( fPercentPositionSong );