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

Standard loops this time.

Browse Source
This commit is contained in:
Jason Felds
2013-04-28 22:55:47 -04:00
parent 34277d80a4
commit efd703c126
1 changed files with 2639 additions and 2639 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteDataUtil.cpp
+6 -6
View File
@@ -468,13 +468,13 @@ void NoteDataUtil::SplitCompositeNoteData( const NoteData &in, vector<NoteData>
void NoteDataUtil::CombineCompositeNoteData( NoteData &out, const vector<NoteData> &in ) void NoteDataUtil::CombineCompositeNoteData( NoteData &out, const vector<NoteData> &in )
{ {
FOREACH_CONST( NoteData, in, nd ) for (NoteData const &nd : in)
{ {
const int iMaxTracks = min( out.GetNumTracks(), nd->GetNumTracks() ); const int iMaxTracks = min( out.GetNumTracks(), nd.GetNumTracks() );
for( int track = 0; track < iMaxTracks; ++track ) for( int track = 0; track < iMaxTracks; ++track )
{ {
for( NoteData::const_iterator i = nd->begin(track); i != nd->end(track); ++i ) for( NoteData::const_iterator i = nd.begin(track); i != nd.end(track); ++i )
{ {
int row = i->first; int row = i->first;
if( out.IsHoldNoteAtRow(track, i->first) ) if( out.IsHoldNoteAtRow(track, i->first) )
@@ -2280,14 +2280,14 @@ void NoteDataUtil::ConvertAdditionsToRegular( NoteData &inout )
void NoteDataUtil::TransformNoteData( NoteData &nd, const AttackArray &aa, StepsType st, Song* pSong ) void NoteDataUtil::TransformNoteData( NoteData &nd, const AttackArray &aa, StepsType st, Song* pSong )
{ {
FOREACH_CONST( Attack, aa, a ) for (Attack const &a : aa)
{ {
PlayerOptions po; PlayerOptions po;
po.FromString( a->sModifiers ); po.FromString( a.sModifiers );
if( po.ContainsTransformOrTurn() ) if( po.ContainsTransformOrTurn() )
{ {
float fStartBeat, fEndBeat; float fStartBeat, fEndBeat;
a->GetAttackBeats( pSong, fStartBeat, fEndBeat ); a.GetAttackBeats( pSong, fStartBeat, fEndBeat );
NoteDataUtil::TransformNoteData( nd, po, st, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) ); NoteDataUtil::TransformNoteData( nd, po, st, BeatToNoteRow(fStartBeat), BeatToNoteRow(fEndBeat) );
} }