diff options
| author | nakeee <nakeee@gmail.com> | 2008-09-26 05:49:33 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-09-26 05:49:33 +0000 |
| commit | 7fcc9abe67759d37c1c3847876d7d3dbbf6c527a (patch) | |
| tree | db1592036058176d001bfc5e44c4bc651e0d7e00 /Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | |
| parent | b632f019dacdcc8503c125041bcd6efaac8d6b8f (diff) | |
Ported windows changes to linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@703 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index 6e44485b64..14733d3771 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -453,8 +453,7 @@ void X11_Read(int _numPAD, SPADStatus* _pPADStatus) int mainvalue = (KeyStatus[CTL_HALFMAIN]) ? 40 : 100; int subvalue = (KeyStatus[CTL_HALFSUB]) ? 40 : 100; - int triggervalueL = (KeyStatus[CTL_TRIGGER_L]) ? 100 : 255; - int triggervalueR = (KeyStatus[CTL_TRIGGER_R]) ? 100 : 255; + int triggervalue = (KeyStatus[CTL_HALFTRIGGER]) ? 100 : 255; if (KeyStatus[CTL_MAINLEFT]){_pPADStatus->stickX -= mainvalue;} if (KeyStatus[CTL_MAINUP]){_pPADStatus->stickY += mainvalue;} @@ -487,12 +486,12 @@ void X11_Read(int _numPAD, SPADStatus* _pPADStatus) if (KeyStatus[CTL_L]) { _pPADStatus->button |= PAD_TRIGGER_L; - _pPADStatus->triggerLeft = triggervalueL; + _pPADStatus->triggerLeft = triggervalue; } if (KeyStatus[CTL_R]) { _pPADStatus->button |= PAD_TRIGGER_R; - _pPADStatus->triggerRight = triggervalueR; + _pPADStatus->triggerRight = triggervalue; } if (KeyStatus[CTL_START]){_pPADStatus->button |= PAD_BUTTON_START;} @@ -642,7 +641,7 @@ void LoadConfig() XK_c, XK_d, XK_Return, - XK_Control_L, + XK_Control_L, XK_q, XK_w, XK_Up, //mainstick |