From 6d384b4ee622d48f982d0139a30c53e7035165ba Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Jun 2003 06:24:13 +0000 Subject: [PATCH] alt- for finer bpm adjustment --- stepmania/src/ScreenEdit.cpp | 7 +++++-- stepmania/src/ScreenGameplay.cpp | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index becfea8244..d89999aece 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -823,7 +823,10 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ case SDLK_F8: fDeltaBPM = + 0.020f; break; default: ASSERT(0); return; } - switch( type ) + if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RALT)) || + INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) ) + fDeltaBPM /= 2; /* .010 */ + else switch( type ) { case IET_SLOW_REPEAT: fDeltaBPM *= 10; break; case IET_FAST_REPEAT: fDeltaBPM *= 40; break; @@ -842,7 +845,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ } else // BPMSegment being modified is m_BPMSegments[i] { - if( i > 0 && fabsf(m_pSong->m_BPMSegments[i-1].m_fBPM - fNewBPM) < 0.025f ) + if( i > 0 && fabsf(m_pSong->m_BPMSegments[i-1].m_fBPM - fNewBPM) < 0.009f ) m_pSong->m_BPMSegments.erase( m_pSong->m_BPMSegments.begin()+i, m_pSong->m_BPMSegments.begin()+i+1); else diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 58699ce1e7..b6415980c7 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1177,17 +1177,20 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ float fOffsetDelta; switch( DeviceI.button ) { - case SDLK_F9: fOffsetDelta = -0.025f; break; - case SDLK_F10: fOffsetDelta = +0.025f; break; + case SDLK_F9: fOffsetDelta = -0.020f; break; + case SDLK_F10: fOffsetDelta = +0.020f; break; default: ASSERT(0); return; } - if( type == IET_FAST_REPEAT ) + if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RALT)) || + INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) ) + fOffsetDelta /= 2; /* .010 */ + else if( type == IET_FAST_REPEAT ) fOffsetDelta *= 10; BPMSegment& seg = GAMESTATE->m_pCurSong->GetBPMSegmentAtBeat( GAMESTATE->m_fSongBeat ); seg.m_fBPM += fOffsetDelta; - m_textDebug.SetText( ssprintf("Cur BPM = %f", seg.m_fBPM) ); + m_textDebug.SetText( ssprintf("Cur BPM = %.2f", seg.m_fBPM) ); m_textDebug.SetDiffuse( RageColor(1,1,1,1) ); m_textDebug.StopTweening(); m_textDebug.BeginTweening( 3 ); // sleep