simplify: we only need to set m_NoteDataRecord; calling NoteField::Load
again is not necessary
This commit is contained in:
@@ -600,8 +600,10 @@ void ScreenEdit::Init()
|
|||||||
m_NoteFieldEdit.Load( &m_NoteDataEdit, -240, 850 );
|
m_NoteFieldEdit.Load( &m_NoteDataEdit, -240, 850 );
|
||||||
this->AddChild( &m_NoteFieldEdit );
|
this->AddChild( &m_NoteFieldEdit );
|
||||||
|
|
||||||
|
m_NoteDataRecord.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
||||||
m_NoteFieldRecord.SetXY( RECORD_X, RECORD_Y );
|
m_NoteFieldRecord.SetXY( RECORD_X, RECORD_Y );
|
||||||
m_NoteFieldRecord.Init( GAMESTATE->m_pPlayerState[PLAYER_1], 10 );
|
m_NoteFieldRecord.Init( GAMESTATE->m_pPlayerState[PLAYER_1], 10 );
|
||||||
|
m_NoteFieldRecord.Load( &m_NoteDataRecord, -(int)SCREEN_HEIGHT/2, (int)SCREEN_HEIGHT/2 );
|
||||||
this->AddChild( &m_NoteFieldRecord );
|
this->AddChild( &m_NoteFieldRecord );
|
||||||
|
|
||||||
m_Clipboard.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
m_Clipboard.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
||||||
@@ -2547,9 +2549,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector<int> &iAns
|
|||||||
GAMESTATE->ResetNoteSkins();
|
GAMESTATE->ResetNoteSkins();
|
||||||
|
|
||||||
// initialize m_NoteFieldRecord
|
// initialize m_NoteFieldRecord
|
||||||
m_NoteDataRecord.SetNumTracks( m_NoteDataEdit.GetNumTracks() );
|
|
||||||
m_NoteDataRecord.CopyAll( m_NoteDataEdit );
|
m_NoteDataRecord.CopyAll( m_NoteDataEdit );
|
||||||
m_NoteFieldRecord.Load( &m_NoteDataRecord, -(int)SCREEN_HEIGHT/2, (int)SCREEN_HEIGHT/2 );
|
|
||||||
|
|
||||||
GAMESTATE->m_fSongBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker - ROWS_PER_MEASURE ); // give a 1 measure lead-in
|
GAMESTATE->m_fSongBeat = NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker - ROWS_PER_MEASURE ); // give a 1 measure lead-in
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user