summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorsmelenchuk <smelenchuk@gmail.com>2011-02-19 07:06:26 +0000
committersmelenchuk <smelenchuk@gmail.com>2011-02-19 07:06:26 +0000
commit050dcad9f8bec499f85aa0be34f3815586d33264 (patch)
treed01fe3ccb2907e5003a1562529a71ed77d45832f /Source/Core/InputCommon
parentad666d5e5c86bdf7bacc3e031e737a5bbf63dfc1 (diff)
Build fixes when using SDL 1.3 related to force feedback support, as suggested in issue #1338.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7199 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
index 66793f1139..603f63d946 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
@@ -105,15 +105,15 @@ Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsi
// constant effect
if ( supported_effects & SDL_HAPTIC_CONSTANT )
{
- outputs.push_back( new ConstantEffect( m_state_out.size() ) );
- AddOutput( EffectIDState() );
+ AddOutput( new ConstantEffect( m_state_out.size() ) );
+ m_state_out.push_back( EffectIDState() );
}
// ramp effect
if ( supported_effects & SDL_HAPTIC_RAMP )
{
- outputs.push_back( new RampEffect( m_state_out.size() ) );
- AddOutput( EffectIDState() );
+ AddOutput( new RampEffect( m_state_out.size() ) );
+ m_state_out.push_back( EffectIDState() );
}
}
#endif