From 2be759893a5e2f12196bb144bede924281282d7d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 23 Jun 2010 11:19:49 -0500 Subject: [PATCH] small comment/cleanup --- src/Font.cpp | 2 +- src/ScoreDisplayAliveTime.h | 2 -- src/StepsUtil.cpp | 7 +++---- src/StepsUtil.h | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Font.cpp b/src/Font.cpp index 11bfaf6396..e012dcb898 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -158,7 +158,7 @@ void FontPage::SetTextureCoords( const vector &widths, int iAdvanceExtraPix void FontPage::SetExtraPixels( int iDrawExtraPixelsLeft, int iDrawExtraPixelsRight ) { /* Hack: do one more than we were asked to; I think a lot of fonts are one - * too low. (who? -aj; todo: source quote) */ + * too low. - glenn */ iDrawExtraPixelsRight++; iDrawExtraPixelsLeft++; diff --git a/src/ScoreDisplayAliveTime.h b/src/ScoreDisplayAliveTime.h index b1697a5efe..dc3cf8e91d 100644 --- a/src/ScoreDisplayAliveTime.h +++ b/src/ScoreDisplayAliveTime.h @@ -23,9 +23,7 @@ public: void UpdateNumber(); - // // Commands - // virtual void PushSelf( lua_State *L ); private: diff --git a/src/StepsUtil.cpp b/src/StepsUtil.cpp index d1c88b0db6..30dee5b56c 100644 --- a/src/StepsUtil.cpp +++ b/src/StepsUtil.cpp @@ -130,7 +130,6 @@ void StepsUtil::SortStepsPointerArrayByNumPlays( vector &vStepsPointers, } } - ASSERT( pProfile ); for(unsigned i = 0; i < vStepsPointers.size(); ++i) { @@ -146,7 +145,7 @@ bool StepsUtil::CompareNotesPointersByRadarValues(const Steps* pSteps1, const St { float fScore1 = 0; float fScore2 = 0; - + fScore1 += pSteps1->GetRadarValues( PLAYER_1 )[RadarCategory_TapsAndHolds]; fScore2 += pSteps2->GetRadarValues( PLAYER_1 )[RadarCategory_TapsAndHolds]; @@ -165,7 +164,7 @@ bool StepsUtil::CompareNotesPointersByDifficulty(const Steps *pSteps1, const Ste void StepsUtil::SortNotesArrayByDifficulty( vector &arraySteps ) { - /* Sort in reverse order of priority. Sort by description first, to get + /* Sort in reverse order of priority. Sort by description first, to get * a predictable order for songs with no radar values (edits). */ stable_sort( arraySteps.begin(), arraySteps.end(), CompareStepsPointersByDescription ); stable_sort( arraySteps.begin(), arraySteps.end(), CompareNotesPointersByRadarValues ); @@ -203,7 +202,7 @@ void StepsUtil::RemoveLockedSteps( const Song *pSong, vector &vpSteps ) { if( UNLOCKMAN->StepsIsLocked(pSong, vpSteps[i]) ) vpSteps.erase( vpSteps.begin()+i ); - } + } } diff --git a/src/StepsUtil.h b/src/StepsUtil.h index 3a569e2c4c..f84c5b660e 100644 --- a/src/StepsUtil.h +++ b/src/StepsUtil.h @@ -66,14 +66,14 @@ namespace StepsUtil bool CompareNotesPointersByRadarValues(const Steps* pSteps1, const Steps* pSteps2); bool CompareNotesPointersByMeter(const Steps *pSteps1, const Steps* pSteps2); bool CompareNotesPointersByDifficulty(const Steps *pSteps1, const Steps *pSteps2); - void SortNotesArrayByDifficulty( vector &vpStepsInOut ); + void SortNotesArrayByDifficulty( vector &vpStepsInOut ); bool CompareStepsPointersByTypeAndDifficulty(const Steps *pStep1, const Steps *pStep2); void SortStepsByTypeAndDifficulty( vector &vpStepsInOut ); void SortStepsPointerArrayByNumPlays( vector &vpStepsInOut, ProfileSlot slot, bool bDescending ); void SortStepsPointerArrayByNumPlays( vector &vpStepsInOut, const Profile* pProfile, bool bDescending ); bool CompareStepsPointersByDescription(const Steps *pStep1, const Steps *pStep2); void SortStepsByDescription( vector &vpStepsInOut ); - void RemoveLockedSteps( const Song *pSong, vector &vpStepsInOut ); + void RemoveLockedSteps( const Song *pSong, vector &vpStepsInOut ); }; class StepsID