diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index f1a0fcb615..eddc0be8d6 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -788,7 +788,7 @@ void InputMapper::GameToMenu( const GameInput &GameI, MenuInput &MenuI ) MenuI = pGame->GameInputToMenuInput( GameI ); } -void InputMapper::StyleToGame( const StyleInput &StyleI, GameInput &GameI ) +void InputMapper::StyleToGame( const StyleInput &StyleI, PlayerNumber pn, GameInput &GameI ) { const Style* pStyle = GAMESTATE->GetCurrentStyle(); GameI = pStyle->StyleInputToGameInput( StyleI ); @@ -835,7 +835,7 @@ bool InputMapper::IsBeingPressed( const StyleInput &StyleI, PlayerNumber pn, Mul { GameInput GameI; StyleToGame( StyleI, GameI ); - return IsBeingPressed( GameI, mp ); + return IsBeingPressed( GameI, pn, mp ); } @@ -874,7 +874,7 @@ float InputMapper::GetSecsHeld( const StyleInput &StyleI, PlayerNumber pn, Multi { GameInput GameI; StyleToGame( StyleI, GameI ); - return GetSecsHeld( GameI, mp ); + return GetSecsHeld( GameI, pn, mp ); } void InputMapper::ResetKeyRepeat( const GameInput &GameI ) diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index 0a0a532a52..ea06687164 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -39,7 +39,7 @@ public: bool GameToDevice( const GameInput &GameI, int iSoltNum, DeviceInput& DeviceI ); // return true if there is a mapping from pad to device void GameToStyle( const GameInput &GameI, StyleInput &StyleI ); - void StyleToGame( const StyleInput &StyleI, GameInput &GameI ); + void StyleToGame( const StyleInput &StyleI, PlayerNumber pn, GameInput &GameI ); void GameToMenu( const GameInput &GameI, MenuInput &MenuI ); void MenuToGame( const MenuInput &MenuI, GameInput GameIout[4] );