From 7cff5036f560a1ec5db88cab9b28fd4f3b2d1f37 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 5 Jul 2011 15:04:24 -0400 Subject: [PATCH] Today, on "choose your commit message": Wolfman wanted a better name for the function thanks to its new purpose. Wolfman wanted everyone to suffer by forcing recompilation of 88 files. Wolfman wanted a sandwich. --- src/ScreenEdit.cpp | 2 +- src/Song.cpp | 6 +++--- src/Song.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index ecf52032b2..0745bfafcf 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -2731,7 +2731,7 @@ void ScreenEdit::TransitionEditState( EditState em ) Steps* pSteps = GAMESTATE->m_pCurSteps[PLAYER_1]; ASSERT( pSteps ); pSteps->SetNoteData( m_NoteDataEdit ); - m_pSong->ReCalculateRadarValuesAndLastBeat(); + m_pSong->ReCalculateRadarValuesAndLastSecond(); m_Background.Unload(); m_Background.LoadFromSong( m_pSong ); diff --git a/src/Song.cpp b/src/Song.cpp index 277ac16a0f..97d62a728b 100644 --- a/src/Song.cpp +++ b/src/Song.cpp @@ -540,7 +540,7 @@ void Song::TidyUpData( bool bFromCache ) /* Generate these before we autogen notes, so the new notes can inherit * their source's values. */ - ReCalculateRadarValuesAndLastBeat( bFromCache ); + ReCalculateRadarValuesAndLastSecond( bFromCache ); Trim( m_sMainTitle ); Trim( m_sSubTitle ); @@ -860,7 +860,7 @@ void Song::TranslateTitles() m_sMainTitleTranslit, m_sSubTitleTranslit, m_sArtistTranslit ); } -void Song::ReCalculateRadarValuesAndLastBeat( bool bFromCache ) +void Song::ReCalculateRadarValuesAndLastSecond( bool bFromCache ) { if( bFromCache && this->GetFirstSecond() >= 0 && this->GetLastSecond() > 0 ) { @@ -935,7 +935,7 @@ void Song::Save() { LOG->Trace( "Song::SaveToSongFile()" ); - ReCalculateRadarValuesAndLastBeat(); + ReCalculateRadarValuesAndLastSecond(); TranslateTitles(); // TODO: Figure out a better way to save to Song's timing data. diff --git a/src/Song.h b/src/Song.h index 279cb8e5b9..1858a136a0 100644 --- a/src/Song.h +++ b/src/Song.h @@ -103,10 +103,10 @@ public: void TidyUpData( bool bFromCache = false ); /** - * @brief Get the new radar values, and determine the last beat at the same time. + * @brief Get the new radar values, and determine the last second at the same time. * * This is called by TidyUpData, after saving the Song. */ - void ReCalculateRadarValuesAndLastBeat( bool bFromCache = false ); + void ReCalculateRadarValuesAndLastSecond( bool bFromCache = false ); /** * @brief Translate any titles that aren't in english. *