diff --git a/src/MsdFile.h b/src/MsdFile.h index 0b52d639ab..229f329082 100644 --- a/src/MsdFile.h +++ b/src/MsdFile.h @@ -10,7 +10,7 @@ public: /** * @brief The list of params found in the files. * - * Note that #param:param:param:param; is one whole value. */ + * Note that #param:param:param:param; is one whole value. */ struct value_t { /** @brief The list of parameters. */ diff --git a/src/NoteData.cpp b/src/NoteData.cpp index 414ccee44e..49449cc833 100644 --- a/src/NoteData.cpp +++ b/src/NoteData.cpp @@ -52,7 +52,7 @@ void NoteData::ClearRangeForTrack( int rowBegin, int rowEnd, int iTrack ) if( rowBegin == rowEnd ) return; - iterator begin, end; + NoteData::TrackMap::iterator begin, end; GetTapNoteRangeInclusive( iTrack, rowBegin, rowEnd, begin, end ); if( begin != end && begin->first < rowBegin && begin->first + begin->second.iDuration > rowEnd ) @@ -86,7 +86,7 @@ void NoteData::ClearRangeForTrack( int rowBegin, int rowEnd, int iTrack ) if( begin != end ) { - iterator prev = end; + NoteData::TrackMap::iterator prev = end; --prev; TapNote tn = begin->second; int iRow = prev->first; @@ -138,7 +138,7 @@ void NoteData::CopyRange( const NoteData& from, int rowFromBegin, int rowFromEnd for( int t=0; t= iStartRow, ssprintf("EndRow %d < StartRow %d",iEndRow,iStartRow) ); /* Include adjacent (non-overlapping) hold notes, since we need to merge with them. */ - iterator begin, end; + NoteData::TrackMap::iterator begin, end; GetTapNoteRangeInclusive( iTrack, iStartRow, iEndRow, begin, end, true ); // Look for other hold notes that overlap and merge them into add. @@ -590,7 +590,7 @@ int NoteData::GetNumHoldNotes( int iStartIndex, int iEndIndex ) const int iNumHolds = 0; for( int t=0; t= 27*4-2 && nnt == green ) // LOG->Trace( "shortening hold at %f, length %d", fBeat, length ); diff --git a/src/NotesWriterSM.h b/src/NotesWriterSM.h index f394a5934b..c8c8f7775b 100644 --- a/src/NotesWriterSM.h +++ b/src/NotesWriterSM.h @@ -26,7 +26,7 @@ namespace NotesWriterSM * @return the name of the edit file. */ RString GetEditFileName( const Song *pSong, const Steps *pSteps ); /** - * @param Write the edit file to the machine for future use. + * @brief Write the edit file to the machine for future use. * @param pSong the Song in question. * @param pSteps the Steps in question. * @param sErrorOut any error messages that may have occurred. @@ -39,7 +39,7 @@ namespace NotesWriterSM /** * @file * @author Chris Danford, Glenn Maynard (c) 2001-2004 - * @seciton LICENSE + * @section LICENSE * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/src/NotesWriterSSC.cpp b/src/NotesWriterSSC.cpp index d665db7b98..0a77bae975 100644 --- a/src/NotesWriterSSC.cpp +++ b/src/NotesWriterSSC.cpp @@ -267,6 +267,7 @@ static RString JoinLineList( vector &lines ) * @brief Retrieve the individual batches of NoteData. * @param song the Song in question. * @param in the Steps in question. + * @param bSavingCache a flag to see if we're saving certain cache data. * @return the NoteData in RString form. */ static RString GetSSCNoteData( const Song &song, const Steps &in, bool bSavingCache ) { diff --git a/src/NotesWriterSSC.h b/src/NotesWriterSSC.h index f22ba24421..aaadfc2812 100644 --- a/src/NotesWriterSSC.h +++ b/src/NotesWriterSSC.h @@ -28,7 +28,7 @@ namespace NotesWriterSSC * @return the name of the edit file. */ RString GetEditFileName( const Song *pSong, const Steps *pSteps ); /** - * @param Write the edit file to the machine for future use. + * @brief Write the edit file to the machine for future use. * @param pSong the Song in question. * @param pSteps the Steps in question. * @param sErrorOut any error messages that may have occurred. diff --git a/src/Player.cpp b/src/Player.cpp index 87625838bc..d9caa5f183 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -1668,7 +1668,7 @@ void Player::Fret( int col, int row, const RageTimer &tm, bool bHeld, bool bRele // Since this is being called every frame, let's not check the whole array every time. // Instead, only check 1 beat back. Even 1 is overkill. const int iStartCheckingAt = max( 0, iSongRow-BeatToNoteRow(1) ); - NoteData::iterator begin, end; + NoteData::TrackMap::iterator begin, end; m_NoteData.GetTapNoteRangeInclusive( iTrack, iStartCheckingAt, iSongRow+1, begin, end ); for( ; begin != end; ++begin ) { @@ -1756,7 +1756,7 @@ void Player::ScoreAllActiveHoldsLetGo() // Since this is being called every frame, let's not check the whole array every time. // Instead, only check 1 beat back. Even 1 is overkill. const int iStartCheckingAt = max( 0, iSongRow-BeatToNoteRow(1) ); - NoteData::iterator begin, end; + NoteData::TrackMap::iterator begin, end; m_NoteData.GetTapNoteRangeInclusive( iTrack, iStartCheckingAt, iSongRow+1, begin, end ); for( ; begin != end; ++begin ) { @@ -1807,7 +1807,7 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b // Instead, only check 1 beat back. Even 1 is overkill. // Just update the life here and let Update judge the roll. const int iStartCheckingAt = max( 0, iSongRow-BeatToNoteRow(1) ); - NoteData::iterator begin, end; + NoteData::TrackMap::iterator begin, end; m_NoteData.GetTapNoteRangeInclusive( col, iStartCheckingAt, iSongRow+1, begin, end ); for( ; begin != end; ++begin ) { diff --git a/src/ScoreDisplayLifeTime.h b/src/ScoreDisplayLifeTime.h index 8972c97899..15e3c228a1 100644 --- a/src/ScoreDisplayLifeTime.h +++ b/src/ScoreDisplayLifeTime.h @@ -6,7 +6,7 @@ #include "AutoActor.h" /** - * @breif Display a updating count of life time remaining. + * @brief Display a updating count of life time remaining. * * This is mainly used for Survival mode. */ class ScoreDisplayLifeTime : public ScoreDisplay