diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index c3cc9b074c..9ef65dc671 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -859,13 +859,6 @@ float InputMapper::GetSecsHeld( const MenuInput &MenuI ) return fMaxSecsHeld; } -float InputMapper::GetSecsHeld( const StyleInput &StyleI, PlayerNumber pn, MultiPlayer mp ) -{ - GameInput GameI; - StyleToGame( StyleI, pn, GameI ); - return GetSecsHeld( GameI, mp ); -} - void InputMapper::ResetKeyRepeat( const GameInput &GameI ) { for( int i=0; iGetSecsHeld( t, pn ); + GameInput GameI; + INPUTMAPPER->StyleToGame( t, pn, GameI ); + const float fSecsHeld = INPUTMAPPER->GetSecsHeld( GameI ); if( fSecsHeld > 0 && fSecsHeld < JUMP_WINDOW_SECONDS ) iNumTracksHeld++; } @@ -1487,7 +1489,9 @@ void Player::CrossedMineRow( int iNoteRow, const RageTimer &now ) if( PREFSMAN->m_fPadStickSeconds > 0 ) { - float fSecsHeld = INPUTMAPPER->GetSecsHeld( t, pn, m_pPlayerState->m_mp ); + GameInput GameI; + INPUTMAPPER->StyleToGame( t, pn, GameI ); + float fSecsHeld = INPUTMAPPER->GetSecsHeld( GameI, m_pPlayerState->m_mp ); if( fSecsHeld >= PREFSMAN->m_fPadStickSeconds ) Step( t, -1, now+(-PREFSMAN->m_fPadStickSeconds), true, false ); } diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index da6a8c8f7f..2d53d3e141 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -886,7 +886,9 @@ void ScreenEdit::Update( float fDeltaTime ) { for( int t=0; tGetCurrentStyle()->m_iColsPerPlayer; t++ ) // for each track { - float fSecsHeld = INPUTMAPPER->GetSecsHeld( t, PLAYER_1 ); + GameInput GameI; + INPUTMAPPER->StyleToGame( t, PLAYER_1, GameI ); + float fSecsHeld = INPUTMAPPER->GetSecsHeld( GameI ); fSecsHeld = min( fSecsHeld, m_RemoveNoteButtonLastChanged.Ago() ); if( fSecsHeld == 0 ) continue;