From 3deda620b9ffc595bb754887539d3a40ca1da2e3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 8 Sep 2006 04:26:23 +0000 Subject: [PATCH] const simplify InputFilter::GetPressedButtons --- stepmania/src/InputFilter.cpp | 14 +++----------- stepmania/src/InputFilter.h | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp index 4e7a2f2426..aa8c2abc3e 100644 --- a/stepmania/src/InputFilter.cpp +++ b/stepmania/src/InputFilter.cpp @@ -315,7 +315,7 @@ const T *FindItemBinarySearch( IT begin, IT end, const T &i ) return &*it; } -bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState ) +bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState ) const { LockMut(*queuemutex); if( pButtonState == NULL ) @@ -324,7 +324,7 @@ bool InputFilter::IsBeingPressed( const DeviceInput &di, const DeviceInputList * return pDI != NULL; } -float InputFilter::GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState ) +float InputFilter::GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState ) const { LockMut(*queuemutex); if( pButtonState == NULL ) @@ -367,15 +367,7 @@ void InputFilter::FlushInputEvents() void InputFilter::GetPressedButtons( vector &array ) { LockMut(*queuemutex); - FOREACHM( DeviceInput, ButtonState, g_ButtonStates, b ) - { - if( b->second.m_BeingHeld ) - { - DeviceInput di = b->first; - di.level = b->second.m_Level; - array.push_back( di ); - } - } + array = g_CurrentState; } /* diff --git a/stepmania/src/InputFilter.h b/stepmania/src/InputFilter.h index de35a2673b..d11704b5a1 100644 --- a/stepmania/src/InputFilter.h +++ b/stepmania/src/InputFilter.h @@ -56,8 +56,8 @@ public: void ResetKeyRepeat( const DeviceInput &di ); // If aButtonState is NULL, use the last reported state. - bool IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState = NULL ); - float GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState = NULL ); + bool IsBeingPressed( const DeviceInput &di, const DeviceInputList *pButtonState = NULL ) const; + float GetSecsHeld( const DeviceInput &di, const DeviceInputList *pButtonState = NULL ) const; RString GetButtonComment( const DeviceInput &di ) const; void GetInputEvents( vector &aEventOut );