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

Merge R and P keys.

Browse Source
This commit is contained in:
Glenn Maynard
2002-10-18 02:08:44 +00:00
parent 3f60901da2
commit dc28f03cde
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+8 -23
View File
@@ -905,6 +905,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_rectRecordBack.SetTweenDiffuse( D3DXCOLOR(0,0,0,0.8f) ); m_rectRecordBack.SetTweenDiffuse( D3DXCOLOR(0,0,0,0.8f) );
} }
break; break;
case DIK_R:
case DIK_P: case DIK_P:
{ {
if( m_NoteFieldEdit.m_fBeginMarker == -1 ) if( m_NoteFieldEdit.m_fBeginMarker == -1 )
@@ -912,28 +913,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
if( m_NoteFieldEdit.m_fEndMarker == -1 ) if( m_NoteFieldEdit.m_fEndMarker == -1 )
m_NoteFieldEdit.m_fEndMarker = m_pSong->m_fLastBeat; m_NoteFieldEdit.m_fEndMarker = m_pSong->m_fLastBeat;
m_EditMode = MODE_PLAYING; if(DeviceI.button == DIK_R) {
m_EditMode = MODE_RECORDING;
m_Player.Load( PLAYER_1, (NoteData*)&m_NoteFieldEdit, NULL, NULL );
m_rectRecordBack.StopTweening();
m_rectRecordBack.BeginTweening( 0.5f );
m_rectRecordBack.SetTweenDiffuse( D3DXCOLOR(0,0,0,0.8f) );
GAMESTATE->m_fSongBeat = m_NoteFieldEdit.m_fBeginMarker - 4; // give a 1 measure lead-in
const float fStartSeconds = m_pSong->GetElapsedTimeFromBeat( GAMESTATE->m_fSongBeat );
m_soundMusic.SetPositionSeconds( fStartSeconds );
m_soundMusic.Play();
m_soundMusic.SetPlaybackRate( GAMESTATE->m_SongOptions.m_fMusicRate );
}
break;
case DIK_R:
{
if( m_NoteFieldEdit.m_fBeginMarker == -1 )
m_NoteFieldEdit.m_fBeginMarker = GAMESTATE->m_fSongBeat;
if( m_NoteFieldEdit.m_fEndMarker == -1 )
m_NoteFieldEdit.m_fEndMarker = m_pSong->m_fLastBeat;
// initialize m_NoteFieldRecord // initialize m_NoteFieldRecord
m_NoteFieldRecord.ClearAll(); m_NoteFieldRecord.ClearAll();
@@ -941,8 +922,12 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_NoteFieldRecord.m_fBeginMarker = m_NoteFieldEdit.m_fBeginMarker; m_NoteFieldRecord.m_fBeginMarker = m_NoteFieldEdit.m_fBeginMarker;
m_NoteFieldRecord.m_fEndMarker = m_NoteFieldEdit.m_fEndMarker; m_NoteFieldRecord.m_fEndMarker = m_NoteFieldEdit.m_fEndMarker;
} else {
m_EditMode = MODE_PLAYING;
m_Player.Load( PLAYER_1, (NoteData*)&m_NoteFieldEdit, NULL, NULL );
}
m_EditMode = MODE_RECORDING;
m_rectRecordBack.StopTweening(); m_rectRecordBack.StopTweening();
m_rectRecordBack.BeginTweening( 0.5f ); m_rectRecordBack.BeginTweening( 0.5f );
m_rectRecordBack.SetTweenDiffuse( D3DXCOLOR(0,0,0,0.8f) ); m_rectRecordBack.SetTweenDiffuse( D3DXCOLOR(0,0,0,0.8f) );