From 799f725ccbcf987fa37a23f4c10c091ecf5f1b97 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 1 Feb 2006 04:59:38 +0000 Subject: [PATCH] Normally, the "fYReverseOffsetPixels" value to NoteField::Init is the distance from the center of the field to the top and bottom. To center record mode, we've been setting this to a low value. That's different from every other place we use NoteField. Instead, set it to a more typical value, and enable the "centered" modifier. --- stepmania/src/ScreenEdit.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index eeea30576c..6ef1ceeb04 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -655,9 +655,6 @@ void ScreenEdit::Init() m_iStartPlayingAt = -1; m_iStopPlayingAt = -1; - m_EditState = STATE_INVALID; - TransitionEditState( STATE_EDITING ); - this->AddChild( &m_Background ); m_SnapDisplay.SetXY( EDIT_X, PLAYER_Y_STANDARD ); @@ -679,10 +676,13 @@ void ScreenEdit::Init() m_NoteDataRecord.SetNumTracks( m_NoteDataEdit.GetNumTracks() ); m_NoteFieldRecord.SetXY( RECORD_X, RECORD_Y ); - m_NoteFieldRecord.Init( GAMESTATE->m_pPlayerState[PLAYER_1], 10 ); + m_NoteFieldRecord.Init( GAMESTATE->m_pPlayerState[PLAYER_1], PLAYER_HEIGHT ); m_NoteFieldRecord.Load( &m_NoteDataRecord, -(int)SCREEN_HEIGHT/2, (int)SCREEN_HEIGHT/2 ); this->AddChild( &m_NoteFieldRecord ); + m_EditState = STATE_INVALID; + TransitionEditState( STATE_EDITING ); + m_bRemoveNoteButtonDown = false; m_Clipboard.SetNumTracks( m_NoteDataEdit.GetNumTracks() ); @@ -1985,6 +1985,9 @@ void ScreenEdit::TransitionEditState( EditState em ) GAMESTATE->m_pPlayerState[PLAYER_1]->RemoveActiveAttacks(); GAMESTATE->m_pPlayerState[PLAYER_1]->RebuildPlayerOptionsFromActiveAttacks(); + if( em == STATE_RECORDING ) + GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_fScrolls[PlayerOptions::SCROLL_CENTERED] = 1.0f; + /* Snap to current options. */ GAMESTATE->m_pPlayerState[PLAYER_1]->m_CurrentPlayerOptions = GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions;