copy hold notes, too

This commit is contained in:
Glenn Maynard
2002-10-12 02:15:29 +00:00
parent a0ef8cc71e
commit a647089528
+3 -2
View File
@@ -39,6 +39,7 @@ NoteData &NoteData::operator= (const NoteData &cpy)
Init(); Init();
for(int t = 0; t < MAX_NOTE_TRACKS; ++t) for(int t = 0; t < MAX_NOTE_TRACKS; ++t)
memmove( m_TapNotes[t], cpy.m_TapNotes[t], sizeof(TapNote) * MAX_TAP_NOTE_ROWS ); memmove( m_TapNotes[t], cpy.m_TapNotes[t], sizeof(TapNote) * MAX_TAP_NOTE_ROWS );
memmove(m_HoldNotes, cpy.m_HoldNotes, sizeof(m_HoldNotes));
m_iNumTracks = cpy.m_iNumTracks; m_iNumTracks = cpy.m_iNumTracks;
m_iNumHoldNotes = cpy.m_iNumHoldNotes; m_iNumHoldNotes = cpy.m_iNumHoldNotes;
@@ -65,7 +66,7 @@ NoteData::~NoteData()
void NoteData::LoadFromSMNoteDataString( CString sSMNoteData ) void NoteData::LoadFromSMNoteDataString( CString sSMNoteData )
{ {
int iNumTracks = m_iNumTracks; int iNumTracks = m_iNumTracks;
NoteData::Init(); Init();
m_iNumTracks = iNumTracks; m_iNumTracks = iNumTracks;
// strip comments out of sSMNoteData // strip comments out of sSMNoteData
@@ -876,7 +877,7 @@ void NoteData::LoadTransformed( NoteData* pOriginal, int iNewNumTracks, const in
ASSERT( iOriginalTrack < pOriginal->m_iNumTracks ); ASSERT( iOriginalTrack < pOriginal->m_iNumTracks );
if( iOriginalTrack == -1 ) if( iOriginalTrack == -1 )
continue; continue;
memcpy( m_TapNotes[t], pOriginal->m_TapNotes[iOriginalTrack], MAX_TAP_NOTE_ROWS*sizeof(m_TapNotes[0][0]) ); memcpy( m_TapNotes[t], pOriginal->m_TapNotes[iOriginalTrack], MAX_TAP_NOTE_ROWS*sizeof(TapNote) );
} }
pOriginal->Convert4sToHoldNotes(); pOriginal->Convert4sToHoldNotes();