From c316b4ec7e5daf239a1346aa6f33e5e90e2f3687 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 21 Jul 2005 01:06:53 +0000 Subject: [PATCH] move m_PlayerStateEdit init nearer to where it's used --- stepmania/src/ScreenEdit.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index f5c062a649..de5690ca7e 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -573,13 +573,6 @@ void ScreenEdit::Init() GAMESTATE->m_fSongBeat = 0; m_fTrailingBeat = GAMESTATE->m_fSongBeat; - /* Not all games have a noteskin named "note" ... */ - if( NOTESKIN->DoesNoteSkinExist("note") ) - m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = "note"; // change noteskin before loading all of the edit Actors - m_PlayerStateEdit.m_PlayerNumber = PLAYER_1; - m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_sNoteSkin; - m_PlayerStateEdit.ResetNoteSkins(); - GAMESTATE->ResetNoteSkins(); GAMESTATE->StoreSelectedOptions(); @@ -597,6 +590,12 @@ void ScreenEdit::Init() m_SnapDisplay.SetZoom( 0.5f ); this->AddChild( &m_SnapDisplay ); + if( NOTESKIN->DoesNoteSkinExist("note") ) + m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = "note"; // change noteskin before loading all of the edit Actors + m_PlayerStateEdit.m_PlayerNumber = PLAYER_1; + m_PlayerStateEdit.m_PlayerOptions.m_sNoteSkin = GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_sNoteSkin; + m_PlayerStateEdit.ResetNoteSkins(); + m_pSteps->GetNoteData( m_NoteDataEdit ); m_NoteFieldEdit.SetXY( EDIT_X, EDIT_Y ); m_NoteFieldEdit.SetZoom( 0.5f );