jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-02-21 11:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

SDL: more global memset

Browse Source
This commit is contained in:
Karol Herbst
2015-01-08 13:37:06 +01:00
parent 306c8d14db
commit 17ad68ff86
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@@ -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;