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

fix up STATE_RECORDING_PAUSED; make this clearer

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-01 05:47:50 +00:00
parent 7a1da2cd5b
commit a6475109a3
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+21 -10
View File
@@ -1957,6 +1957,27 @@ void ScreenEdit::TransitionEditState( EditState em )
break; break;
} }
// Set up player options for this mode. (EDITING uses m_PlayerStateEdit, which we
// don't need to change.)
if( em != STATE_EDITING )
{
// Stop displaying course attacks, if any.
GAMESTATE->m_pPlayerState[PLAYER_1]->RemoveActiveAttacks();
// Load the player's default PlayerOptions.
GAMESTATE->m_pPlayerState[PLAYER_1]->RebuildPlayerOptionsFromActiveAttacks();
switch( em )
{
case STATE_RECORDING:
case STATE_RECORDING_PAUSED:
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_fScrolls[PlayerOptions::SCROLL_CENTERED] = 1.0f;
break;
}
/* Snap to current options. */
GAMESTATE->m_pPlayerState[PLAYER_1]->m_CurrentPlayerOptions = GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions;
}
switch( em ) switch( em )
{ {
case STATE_EDITING: case STATE_EDITING:
@@ -1981,16 +2002,6 @@ void ScreenEdit::TransitionEditState( EditState em )
{ {
GAMESTATE->ResetOriginalSyncData(); GAMESTATE->ResetOriginalSyncData();
/* Stop displaying course attacks, if any, and return to the player's defaults. */
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;
/* Give a 1 second lead-in. If we're loading Player, this must be done first. */ /* Give a 1 second lead-in. If we're loading Player, this must be done first. */
float fSeconds = m_pSong->m_Timing.GetElapsedTimeFromBeat( NoteRowToBeat(m_iStartPlayingAt) ) - 1; float fSeconds = m_pSong->m_Timing.GetElapsedTimeFromBeat( NoteRowToBeat(m_iStartPlayingAt) ) - 1;
GAMESTATE->UpdateSongPosition( fSeconds, m_pSong->m_Timing ); GAMESTATE->UpdateSongPosition( fSeconds, m_pSong->m_Timing );