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

Simplify, fix something I just broke.

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-01 20:04:19 +00:00
parent 636a7512e2
commit 5a7f4d5b3b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+5 -8
View File
@@ -470,7 +470,6 @@ void NoteData::LoadOverlapped( const NoteData* pOriginal, int iNewNumTracks )
CopyRange( pOriginal, 0, pOriginal->GetLastRow(), 0 );
const int iOriginalTracks = pOriginal->GetNumTracks();
const bool iUnevenTracks = (iOriginalTracks % iNewNumTracks) != 0;
const int iTracksToOverlap = iOriginalTracks / iNewNumTracks;
if( iTracksToOverlap )
{
@@ -480,16 +479,14 @@ void NoteData::LoadOverlapped( const NoteData* pOriginal, int iNewNumTracks )
{
for (int iy = 0; iy < iTracksToOverlap; iy++)
{
CombineTracks(ix, (ix + iy * iNewNumTracks));
CombineTracks( ix, ix + iy * iNewNumTracks );
}
}
if( iUnevenTracks )
const int iUnevenTracks = iOriginalTracks % iNewNumTracks;
for (int ix = iOriginalTracks - iUnevenTracks; ix < iOriginalTracks; ix++)
{
for (int ix = iOriginalTracks - iUnevenTracks; ix < iOriginalTracks; ix++)
{
// spread out the remaining tracks evenly
CombineTracks((ix * iOriginalTracks) % iNewNumTracks, ix);
}
// spread out the remaining tracks evenly
CombineTracks( (ix * iOriginalTracks) % iNewNumTracks, ix );
}
}
SetNumTracks( iNewNumTracks );