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

[splittiming] More SST fixes.

Browse Source
This commit is contained in:
Jason Felds
2011-05-13 09:44:54 -04:00
parent a7b58e07a2
commit 6f6c18e050
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEdit.cpp
+7 -4
View File
@@ -2154,6 +2154,9 @@ void ScreenEdit::InputRecord( const InputEventPlus &input, EditButton EditB )
return; return;
} }
if ( !GAMESTATE->m_bIsEditorStepTiming )
return; // can't allow changes if in song timing.
if( input.pn != PLAYER_1 ) if( input.pn != PLAYER_1 )
return; // ignore return; // ignore
@@ -3667,16 +3670,16 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector<int> &iAns
TransitionEditState( STATE_RECORDING ); TransitionEditState( STATE_RECORDING );
break; break;
case insert_and_shift: case insert_and_shift:
NoteDataUtil::InsertRows( m_NoteDataEdit, BeatToNoteRow(GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat), BeatToNoteRow(1) ); NoteDataUtil::InsertRows( m_NoteDataEdit, BeatToNoteRow( GetBeat() ), BeatToNoteRow(1) );
break; break;
case delete_and_shift: case delete_and_shift:
NoteDataUtil::DeleteRows( m_NoteDataEdit, BeatToNoteRow(GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat), BeatToNoteRow(1) ); NoteDataUtil::DeleteRows( m_NoteDataEdit, BeatToNoteRow( GetBeat() ), BeatToNoteRow(1) );
break; break;
case shift_pauses_forward: case shift_pauses_forward:
m_pSteps->m_Timing.InsertRows( BeatToNoteRow(GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat), BeatToNoteRow(1) ); GetAppropriateTiming().InsertRows( BeatToNoteRow( GetBeat() ), BeatToNoteRow(1) );
break; break;
case shift_pauses_backward: case shift_pauses_backward:
m_pSteps->m_Timing.DeleteRows( BeatToNoteRow(GAMESTATE->m_pPlayerState[PLAYER_1]->m_Position.m_fSongBeat), BeatToNoteRow(1) ); GetAppropriateTiming().DeleteRows( BeatToNoteRow( GetBeat() ), BeatToNoteRow(1) );
break; break;
case convert_to_pause: case convert_to_pause:
{ {