summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authordaco65 <daco65@gmail.com>2009-02-09 01:40:25 +0000
committerdaco65 <daco65@gmail.com>2009-02-09 01:40:25 +0000
commitbb4cec5b4597a5367dd1504d734545eb93917be7 (patch)
tree516f2533e46734788f85c1658437f8a9b0253d34 /Source
parentf4025a8caae9187b581e8784fd98046961de68d9 (diff)
this is just temp until i can talk to JP why added the 6000 in the first place. doesn't make sense to me
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2170 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
index ffdf347533..0c697a6aaf 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
@@ -251,8 +251,9 @@ wxString ConfigBox::GetButtonText(int id, int Page)
bool AvoidValues(int value)
{
// Avoid detecting very small or very big (for triggers) values
- if( (value > -0x2000 && value < 0x2000) // Small values
- || (value < -0x6000 && value > 0x6000)) // Big values
+ // for the record, the only accepted value's were between -6000 & -2000 and between 2000 & 6000
+ if( (value > -0x2000 && value < 0x2000)) // Small values
+ //|| (value < -0x6000 || value > 0x6000)) // Big values. might intervene with alot of controllers as they go way above 6000
return true; // Avoid
else
return false; // Keep