diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-12 02:08:01 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-12 02:08:01 +0000 |
| commit | ff5081942ad26557a5c6eddfb44d19fd99964ad5 (patch) | |
| tree | b02cdc5d80feaca47287d44b0263b7c739793fb3 /Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp | |
| parent | d937b73d9c3bc6919ebdcbf40065fbb5309d2dd9 (diff) | |
New GCPad/Wiimote: Hopefully fixed lock up issues with DirectInput devices. Wiimote tilt should work with keyboard keys/gamepad buttons now as well as IR Forward/Backward(which was added). Made input detection buttons display "[ waiting ]" while waiting for input. minor fixes/cleanups.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5651 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp')
| -rw-r--r-- | Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp b/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp index e1d433f33f..1e35cb9731 100644 --- a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp +++ b/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp @@ -256,7 +256,7 @@ ControllerEmu::MixedTriggers::MixedTriggers( const char* const _name ) : Control ControllerEmu::Triggers::Triggers( const char* const _name ) : ControlGroup( _name, GROUP_TYPE_TRIGGERS ) { - settings.push_back( new Setting("Dead Zone", 0, 1, 50 ) ); + settings.push_back( new Setting("Dead Zone", 0, 0, 50 ) ); } ControllerEmu::Force::Force( const char* const _name ) : ControlGroup( _name, GROUP_TYPE_FORCE ) @@ -272,8 +272,11 @@ ControllerEmu::Force::Force( const char* const _name ) : ControlGroup( _name, GR settings.push_back( new Setting("Dead Zone", 0, 0, 50 ) ); } -ControllerEmu::Tilt::Tilt( const char* const _name ) : ControlGroup( _name, GROUP_TYPE_TILT ) +ControllerEmu::Tilt::Tilt( const char* const _name ) + : ControlGroup( _name, GROUP_TYPE_TILT ) { + memset(m_tilt, 0, sizeof(m_tilt)); + //for ( unsigned int i = 0; i < 4; ++i ) //controls.push_back( new Input( named_directions[i] ) ); controls.push_back( new Input( "Forward" ) ); @@ -289,12 +292,13 @@ ControllerEmu::Tilt::Tilt( const char* const _name ) : ControlGroup( _name, GROU ControllerEmu::Cursor::Cursor( const char* const _name, const SWiimoteInitialize* const _wiimote_initialize ) : ControlGroup( _name, GROUP_TYPE_CURSOR ) - //, z(0) , wiimote_initialize(_wiimote_initialize) + , m_z(0) { for ( unsigned int i = 0; i < 4; ++i ) controls.push_back( new Input( named_directions[i] ) ); controls.push_back( new Input( "Forward" ) ); + controls.push_back( new Input( "Backward" ) ); controls.push_back( new Input( "Hide" ) ); settings.push_back( new Setting("Center", 0.5f ) ); |