From d93a57c841d56f1878702078b8af608b177b513e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 8 Sep 2006 04:04:40 +0000 Subject: [PATCH] add DeviceInputList * --- stepmania/src/InputMapper.cpp | 4 ++-- stepmania/src/InputMapper.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 5226dd99d4..bed0afd6f5 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -802,7 +802,7 @@ void InputMapper::MenuToGame( const MenuInput &MenuI, GameInput GameIout[4] ) } -bool InputMapper::IsBeingPressed( const GameInput &GameI, MultiPlayer mp ) +bool InputMapper::IsBeingPressed( const GameInput &GameI, MultiPlayer mp, const DeviceInputList *pButtonState ) { for( int i=0; iIsBeingPressed( DeviceI ) ) + if( INPUTFILTER->IsBeingPressed(DeviceI, pButtonState) ) return true; } } diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h index 68e329bb12..7efba468c4 100644 --- a/stepmania/src/InputMapper.h +++ b/stepmania/src/InputMapper.h @@ -48,7 +48,7 @@ public: float GetSecsHeld( const MenuInput &MenuI ); float GetSecsHeld( const StyleInput &StyleI, MultiPlayer mp = MultiPlayer_INVALID ); - bool IsBeingPressed( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID ); + bool IsBeingPressed( const GameInput &GameI, MultiPlayer mp = MultiPlayer_INVALID, const DeviceInputList *pButtonState = NULL ); bool IsBeingPressed( const MenuInput &MenuI ); bool IsBeingPressed( const StyleInput &StyleI, MultiPlayer mp = MultiPlayer_INVALID );