actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify. Remove the condition from the iterator. Almost nothing uses it (although other things could), it seems more trouble than it's worth.

Browse Source
This commit is contained in:
Steve Checkoway
2007-09-17 03:27:33 +00:00
parent 215fd9f2ad
commit 15611d510b
4 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+2 -19
View File
@@ -925,18 +925,7 @@ void NoteData::_all_tracks_iterator<ND, iter, TN>::Find( bool bReverse )
for( int iTrack = m_pNoteData->GetNumTracks() - 1; iTrack >= 0; --iTrack )
{
iter &i( m_vCurrentIters[iTrack] );
const iter &begin = m_vBeginIters[iTrack];
const iter &end = m_vEndIters[iTrack];
if( m_Cond )
{
while( i != end && i->first > iMaxRow && !m_Cond(i->second) )
{
if( i == begin )
i = end;
else
--i;
}
}
if( i != end && i->first > iMaxRow )
{
iMaxRow = i->first;
@@ -952,11 +941,6 @@ void NoteData::_all_tracks_iterator<ND, iter, TN>::Find( bool bReverse )
{
iter &i = m_vCurrentIters[iTrack];
const iter &end = m_vEndIters[iTrack];
if( m_Cond )
{
while( i != end && i->first < iMinRow && !m_Cond(i->second) )
++i;
}
if( i != end && i->first < iMinRow )
{
iMinRow = i->first;
@@ -967,8 +951,8 @@ void NoteData::_all_tracks_iterator<ND, iter, TN>::Find( bool bReverse )
}
template<typename ND, typename iter, typename TN>
NoteData::_all_tracks_iterator<ND, iter, TN>::_all_tracks_iterator( ND &nd, int iStartRow, int iEndRow, bool bReverse, NoteData::IteratorCond cond, bool bInclusive ) :
m_pNoteData(&nd), m_iTrack(0), m_bReverse(bReverse), m_Cond(cond)
NoteData::_all_tracks_iterator<ND, iter, TN>::_all_tracks_iterator( ND &nd, int iStartRow, int iEndRow, bool bReverse, bool bInclusive ) :
m_pNoteData(&nd), m_iTrack(0), m_bReverse(bReverse)
{
ASSERT( m_pNoteData->GetNumTracks() > 0 );
@@ -1006,7 +990,6 @@ NoteData::_all_tracks_iterator<ND, iter, TN>::_all_tracks_iterator( const _all_t
COPY_OTHER( m_pNoteData ),
COPY_OTHER( m_iTrack ),
COPY_OTHER( m_bReverse ),
COPY_OTHER( m_Cond ),
COPY_OTHER( m_vBeginIters ),
COPY_OTHER( m_vEndIters ),
COPY_OTHER( m_vCurrentIters )