diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp index dacd592def..05ce5fb52f 100644 --- a/stepmania/src/RageInput.cpp +++ b/stepmania/src/RageInput.cpp @@ -42,7 +42,7 @@ void RageInput::Update( float fDeltaTime ) { /* Update optional devices. */ for( unsigned i = 0; i < m_pDevices.size(); ++i ) - m_pDevices[i]->Update( fDeltaTime ); + m_pDevices[i]->Update(); } bool RageInput::DevicesChanged() diff --git a/stepmania/src/arch/InputHandler/InputHandler.h b/stepmania/src/arch/InputHandler/InputHandler.h index 22b0c9850c..b6692d8bb0 100644 --- a/stepmania/src/arch/InputHandler/InputHandler.h +++ b/stepmania/src/arch/InputHandler/InputHandler.h @@ -27,7 +27,7 @@ class InputHandler public: InputHandler() { m_iInputsSinceUpdate = 0; } virtual ~InputHandler() { } - virtual void Update( float fDeltaTime ) { } + virtual void Update() { } virtual bool DevicesChanged() { return false; } virtual void GetDevicesAndDescriptions( vector& vDevicesOut, vector& vDescriptionsOut ) = 0; diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp index f778bde89c..7c2ef604bb 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.cpp @@ -448,7 +448,7 @@ void InputHandler_DInput::PollAndAcquireDevices() } } -void InputHandler_DInput::Update( float fDeltaTime ) +void InputHandler_DInput::Update() { RageTimer zero; zero.SetZero(); diff --git a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h index 3e14aa7638..302bbee6ff 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h +++ b/stepmania/src/arch/InputHandler/InputHandler_DirectInput.h @@ -11,7 +11,7 @@ public: InputHandler_DInput(); ~InputHandler_DInput(); void GetDevicesAndDescriptions( vector& vDevicesOut, vector& vDescriptionsOut ); - void Update( float fDeltaTime ); + void Update(); bool DevicesChanged(); void WindowReset(); diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp index 8718d1d80b..2113414789 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.cpp @@ -161,7 +161,7 @@ InputHandler_Linux_tty::~InputHandler_Linux_tty() handler = NULL; } -void InputHandler_Linux_tty::Update(float fDeltaTime) +void InputHandler_Linux_tty::Update() { while (1) { diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h index f5e01e8512..3f4bd2fc3a 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_tty.h @@ -9,7 +9,7 @@ class InputHandler_Linux_tty: public InputHandler static void OnCrash(int); public: - void Update(float fDeltaTime); + void Update(); InputHandler_Linux_tty(); ~InputHandler_Linux_tty(); void GetDevicesAndDescriptions(vector& vDevicesOut, vector& vDescriptionsOut); diff --git a/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.cpp b/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.cpp index 2f9c8aa162..b6871fca96 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.cpp @@ -56,7 +56,7 @@ int GetRandomKeyboadKey() } -void InputHandler_MonkeyKeyboard::Update(float fDeltaTime) +void InputHandler_MonkeyKeyboard::Update() { if( !PREFSMAN->m_bMonkeyInput ) { diff --git a/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h b/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h index dfac8a647d..5d300b928d 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h +++ b/stepmania/src/arch/InputHandler/InputHandler_MonkeyKeyboard.h @@ -8,7 +8,7 @@ class InputHandler_MonkeyKeyboard: public InputHandler { public: - void Update( float fDeltaTime ); + void Update(); InputHandler_MonkeyKeyboard(); ~InputHandler_MonkeyKeyboard(); void GetDevicesAndDescriptions( vector& vDevicesOut, vector& vDescriptionsOut ); diff --git a/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp b/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp index edbc4bd6ef..e0d6d5599c 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp @@ -189,7 +189,7 @@ InputHandler_SDL::~InputHandler_SDL() mySDL_EventState(Handled_SDL_Events[i], SDL_IGNORE); } -void InputHandler_SDL::Update(float fDeltaTime) +void InputHandler_SDL::Update() { SDL_Event event; while(SDL_GetEvent(event, SDL_EventMask)) diff --git a/stepmania/src/arch/InputHandler/InputHandler_SDL.h b/stepmania/src/arch/InputHandler/InputHandler_SDL.h index b7f3072375..19f999e813 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_SDL.h +++ b/stepmania/src/arch/InputHandler/InputHandler_SDL.h @@ -11,7 +11,7 @@ class InputHandler_SDL: public InputHandler vector Joysticks; public: - void Update(float fDeltaTime); + void Update(); InputHandler_SDL(); ~InputHandler_SDL(); void GetDevicesAndDescriptions(vector& vDevicesOut, vector& vDescriptionsOut); diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp index 7767cfddb8..4a678299eb 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.cpp @@ -116,7 +116,7 @@ void InputHandler_Win32_Pump::InputThreadMain() CHECKPOINT; } -void InputHandler_Win32_Pump::Update( float fDeltaTime ) +void InputHandler_Win32_Pump::Update() { if( !InputThread.IsCreated() ) { diff --git a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h index a5650d1c94..732b04356f 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Win32_Pump.h @@ -8,7 +8,7 @@ class USBDevice; class InputHandler_Win32_Pump: public InputHandler { public: - void Update( float fDeltaTime ); + void Update(); InputHandler_Win32_Pump(); ~InputHandler_Win32_Pump(); void GetDevicesAndDescriptions( vector& vDevicesOut, vector& vDescriptionsOut ); diff --git a/stepmania/src/arch/InputHandler/InputHandler_X11.cpp b/stepmania/src/arch/InputHandler/InputHandler_X11.cpp index dfc1f57025..0cbfa1cece 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_X11.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_X11.cpp @@ -140,7 +140,7 @@ InputHandler_X11::~InputHandler_X11() X11Helper::Stop(); } -void InputHandler_X11::Update(float fDeltaTime) +void InputHandler_X11::Update() { XEvent event; diff --git a/stepmania/src/arch/InputHandler/InputHandler_X11.h b/stepmania/src/arch/InputHandler/InputHandler_X11.h index 45959e2f17..9840940fbb 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_X11.h +++ b/stepmania/src/arch/InputHandler/InputHandler_X11.h @@ -10,7 +10,7 @@ class InputHandler_X11: public InputHandler public: InputHandler_X11(); ~InputHandler_X11(); - void Update(float fDeltaTime); + void Update(); void GetDevicesAndDescriptions(vector& vDevicesOut, vector& vDescriptionsOut); }; #define USE_INPUT_HANDLER_X11 diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp index 4acd2c2448..ed342ed872 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp @@ -54,7 +54,7 @@ InputHandler_Xbox::~InputHandler_Xbox() } } -void InputHandler_Xbox::Update(float fDeltaTime) +void InputHandler_Xbox::Update() { // check insertions and removals DWORD dwInsert, dwRemove; @@ -232,4 +232,4 @@ void InputHandler_Xbox::getHandles() * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. - */ \ No newline at end of file + */ diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h index 809ac6ac82..45f31de459 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h +++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h @@ -13,7 +13,7 @@ class InputHandler_Xbox: public InputHandler XINPUT_GAMEPAD lastState[NUM_JOYSTICKS]; public: - void Update(float fDeltaTime); + void Update(); InputHandler_Xbox(); ~InputHandler_Xbox(); void GetDevicesAndDescriptions(vector& vDevicesOut, vector& vDescriptionsOut);