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

Use preincrement for iterators to prevent making a copy of the iterator and simplify making a pair.

Browse Source
This commit is contained in:
Steve Checkoway
2007-09-16 00:52:16 +00:00
parent 5a0ae85deb
commit b4cb0893ff
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+8 -8
View File
@@ -718,7 +718,7 @@ void Player::Update( float fDeltaTime )
NoteData::all_tracks_iterator &iter = *m_pIterCurrentOrUpcoming; NoteData::all_tracks_iterator &iter = *m_pIterCurrentOrUpcoming;
while( !iter.IsAtEnd() && iter.Row() < iSongRow ) while( !iter.IsAtEnd() && iter.Row() < iSongRow )
{ {
iter++; ++iter;
} }
multimap<int,TrackRowTapNote> mapRowToTap; multimap<int,TrackRowTapNote> mapRowToTap;
@@ -731,7 +731,7 @@ void Player::Update( float fDeltaTime )
NoteData::iterator iter = m_pIterCurrentOrUpcoming->GetIter(t); NoteData::iterator iter = m_pIterCurrentOrUpcoming->GetIter(t);
if( iter == m_NoteData.begin(t) ) if( iter == m_NoteData.begin(t) )
continue; // no previous note available continue; // no previous note available
iter--; --iter;
TapNote &tn = iter->second; TapNote &tn = iter->second;
int iRow = iter->first; int iRow = iter->first;
ASSERT( iRow < iSongRow ); ASSERT( iRow < iSongRow );
@@ -741,7 +741,7 @@ void Player::Update( float fDeltaTime )
if( !bInRange ) if( !bInRange )
continue; continue;
TrackRowTapNote trtn = { t, iRow, &tn }; TrackRowTapNote trtn = { t, iRow, &tn };
mapRowToTap.insert( pair<int,TrackRowTapNote>(iRow,trtn) ); mapRowToTap.insert( make_pair(iRow,trtn) );
} }
// mapRowToTap now contains all overlapping holds sored by row // mapRowToTap now contains all overlapping holds sored by row
@@ -912,8 +912,8 @@ void Player::UpdateHoldNotes( int iSongRow, float fDeltaTime, vector<TrackRowTap
if( bInitiatedNote && fLife != 0 ) if( bInitiatedNote && fLife != 0 )
{ {
/* This hold note is not judged and we stepped on its head. Update iLastHeldRow. /* This hold note is not judged and we stepped on its head. Update iLastHeldRow.
* Do this even if we're a little beyond the end of the hold note, to make sure * Do this even if we're a little beyond the end of the hold note, to make sure
* iLastHeldRow is clamped to iEndRow if the hold note is held all the way. */ * iLastHeldRow is clamped to iEndRow if the hold note is held all the way. */
FOREACH( TrackRowTapNote, vTN, trtn ) FOREACH( TrackRowTapNote, vTN, trtn )
{ {
TapNote &tn = *trtn->pTN; TapNote &tn = *trtn->pTN;
@@ -2183,7 +2183,7 @@ void Player::UpdateJudgedRows()
{ {
NoteData::all_tracks_iterator iter = *m_pIterUnjudgedRows; NoteData::all_tracks_iterator iter = *m_pIterUnjudgedRows;
int iLastSeenRow = -1; int iLastSeenRow = -1;
for( ; !iter.IsAtEnd() && iter.Row() <= iEndRow; iter++ ) for( ; !iter.IsAtEnd() && iter.Row() <= iEndRow; ++iter )
{ {
int iRow = iter.Row(); int iRow = iter.Row();
@@ -2229,7 +2229,7 @@ void Player::UpdateJudgedRows()
set<RageSound *> setSounds; set<RageSound *> setSounds;
NoteData::all_tracks_iterator iter = *m_pIterUnjudgedMineRows; // copy NoteData::all_tracks_iterator iter = *m_pIterUnjudgedMineRows; // copy
int iLastSeenRow = -1; int iLastSeenRow = -1;
for( ; !iter.IsAtEnd() && iter.Row() <= iEndRow; iter++ ) for( ; !iter.IsAtEnd() && iter.Row() <= iEndRow; ++iter )
{ {
int iRow = iter.Row(); int iRow = iter.Row();
TapNote &tn = *iter; TapNote &tn = *iter;
@@ -2317,7 +2317,7 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
NoteData::all_tracks_iterator &iter = *m_pIterUncrossedRows; NoteData::all_tracks_iterator &iter = *m_pIterUncrossedRows;
int iLastSeenRow = -1; int iLastSeenRow = -1;
for( ; !iter.IsAtEnd() && iter.Row() <= iLastRowCrossed; iter++ ) for( ; !iter.IsAtEnd() && iter.Row() <= iLastRowCrossed; ++iter )
{ {
/* Apply InitialHoldLife. */ /* Apply InitialHoldLife. */
TapNote &tn = *iter; TapNote &tn = *iter;