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

all this does is remove a level of indentation; diff isn't very smart

Browse Source 
about that.
This commit is contained in:
Glenn Maynard
2002-10-11 18:23:05 +00:00
parent cc0735ecd7
commit b90af9fdf4
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+35 -34
View File
@@ -751,47 +751,48 @@ void Song::AddAutoGenNotes()
{ {
for( NotesType ntMissing=(NotesType)0; ntMissing<NUM_NOTES_TYPES; ntMissing=(NotesType)(ntMissing+1) ) for( NotesType ntMissing=(NotesType)0; ntMissing<NUM_NOTES_TYPES; ntMissing=(NotesType)(ntMissing+1) )
{ {
if( !SongHasNotesType(ntMissing) ) // missing Notes of this type if( SongHasNotesType(ntMissing) )
continue;
// missing Notes of this type
int iNumTracksOfMissing = GAMEMAN->NotesTypeToNumTracks(ntMissing);
// look for closest match
NotesType ntBestMatch = (NotesType)-1;
int iBestTrackDifference = 10000; // inf
for( NotesType nt=(NotesType)0; nt<NUM_NOTES_TYPES; nt=(NotesType)(nt+1) )
{ {
int iNumTracksOfMissing = GAMEMAN->NotesTypeToNumTracks(ntMissing); int iNumTracks = GAMEMAN->NotesTypeToNumTracks(nt);
int iTrackDifference = abs(iNumTracks-iNumTracksOfMissing);
// look for closest match CArray<Notes*,Notes*> apNotes;
NotesType ntBestMatch = (NotesType)-1; this->GetNotesThatMatch( nt, apNotes );
int iBestTrackDifference = 10000; // inf if( iTrackDifference<iBestTrackDifference && apNotes.GetSize() > 0 && apNotes[0]->m_sDescription.Find("autogen")==-1 )
for( NotesType nt=(NotesType)0; nt<NUM_NOTES_TYPES; nt=(NotesType)(nt+1) )
{ {
int iNumTracks = GAMEMAN->NotesTypeToNumTracks(nt); ntBestMatch = nt;
int iTrackDifference = abs(iNumTracks-iNumTracksOfMissing); iBestTrackDifference = iTrackDifference;
CArray<Notes*,Notes*> apNotes;
this->GetNotesThatMatch( nt, apNotes );
if( iTrackDifference<iBestTrackDifference && apNotes.GetSize() > 0 && apNotes[0]->m_sDescription.Find("autogen")==-1 )
{
ntBestMatch = nt;
iBestTrackDifference = iTrackDifference;
}
} }
}
if( ntBestMatch != -1 ) if( ntBestMatch != -1 )
{
for( int j=0; j<m_apNotes.GetSize(); j++ )
{ {
for( int j=0; j<m_apNotes.GetSize(); j++ ) Notes* pOriginalNotes = m_apNotes[j];
{ if( pOriginalNotes->m_NotesType != ntBestMatch )
Notes* pOriginalNotes = m_apNotes[j]; continue; // skip
if( pOriginalNotes->m_NotesType != ntBestMatch )
continue; // skip
Notes* pNewNotes = new Notes; Notes* pNewNotes = new Notes;
pNewNotes->m_Difficulty = pOriginalNotes->m_Difficulty; pNewNotes->m_Difficulty = pOriginalNotes->m_Difficulty;
pNewNotes->m_iMeter = pOriginalNotes->m_iMeter; pNewNotes->m_iMeter = pOriginalNotes->m_iMeter;
pNewNotes->m_sDescription = pOriginalNotes->m_sDescription + " (autogen)"; pNewNotes->m_sDescription = pOriginalNotes->m_sDescription + " (autogen)";
pNewNotes->m_NotesType = ntMissing; pNewNotes->m_NotesType = ntMissing;
NoteData originalNoteData, newNoteData; NoteData originalNoteData, newNoteData;
pOriginalNotes->GetNoteData( &originalNoteData ); pOriginalNotes->GetNoteData( &originalNoteData );
newNoteData.LoadTransformedSlidingWindow( &originalNoteData, iNumTracksOfMissing ); newNoteData.LoadTransformedSlidingWindow( &originalNoteData, iNumTracksOfMissing );
pNewNotes->SetNoteData( &newNoteData ); pNewNotes->SetNoteData( &newNoteData );
this->m_apNotes.Add( pNewNotes ); this->m_apNotes.Add( pNewNotes );
}
} }
} }
} }