From 17ad68ff86c7508f4e8a82ae65f31bc2d59cee79 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Thu, 8 Jan 2015 13:37:06 +0100 Subject: SDL: more global memset --- .../Core/InputCommon/ControllerInterface/SDL/SDL.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp') diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp index b75670394c..8ed142740e 100644 --- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp @@ -205,9 +205,14 @@ std::string Joystick::LeftRightEffect::GetName() const return "LeftRight"; } -void Joystick::ConstantEffect::SetState(ControlState state) +void Joystick::HapticEffect::SetState(ControlState state) { memset(&m_effect, 0, sizeof(m_effect)); + _SetState(state); +} + +void Joystick::ConstantEffect::_SetState(ControlState state) +{ if (state) { m_effect.type = SDL_HAPTIC_CONSTANT; @@ -222,9 +227,8 @@ void Joystick::ConstantEffect::SetState(ControlState state) Update(); } -void Joystick::RampEffect::SetState(ControlState state) +void Joystick::RampEffect::_SetState(ControlState state) { - memset(&m_effect, 0, sizeof(m_effect)); if (state) { m_effect.type = SDL_HAPTIC_RAMP; @@ -239,9 +243,8 @@ void Joystick::RampEffect::SetState(ControlState state) Update(); } -void Joystick::SineEffect::SetState(ControlState state) +void Joystick::SineEffect::_SetState(ControlState state) { - memset(&m_effect, 0, sizeof(m_effect)); if (state) { m_effect.type = SDL_HAPTIC_SINE; @@ -261,9 +264,8 @@ void Joystick::SineEffect::SetState(ControlState state) Update(); } -void Joystick::TriangleEffect::SetState(ControlState state) +void Joystick::TriangleEffect::_SetState(ControlState state) { - memset(&m_effect, 0, sizeof(m_effect)); if (state) { m_effect.type = SDL_HAPTIC_TRIANGLE; @@ -283,9 +285,8 @@ void Joystick::TriangleEffect::SetState(ControlState state) Update(); } -void Joystick::LeftRightEffect::SetState(ControlState state) +void Joystick::LeftRightEffect::_SetState(ControlState state) { - memset(&m_effect, 0, sizeof(m_effect)); if (state) { m_effect.type = SDL_HAPTIC_LEFTRIGHT; -- cgit v1.2.3