ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SimplePad fix 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@701 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2008-09-25 21:59:48 +00:00
parent b5eef72a7d
commit 14880b0232
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
View File

@ -38,10 +38,9 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
EVT_BUTTON(CTL_Y,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_Y,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_Z,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_Z,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_START,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_START,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_TRIGGER_L,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_L,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_L,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_TRIGGER_R,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_R,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_R,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_HALFTRIGGER,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_MAINUP,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_MAINUP,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_MAINDOWN,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_MAINDOWN,ConfigDialog::OnButtonClick)
EVT_BUTTON(CTL_MAINLEFT,ConfigDialog::OnButtonClick) EVT_BUTTON(CTL_MAINLEFT,ConfigDialog::OnButtonClick)
@ -168,7 +167,7 @@ void ConfigDialog::CreateGUIControls()
sModifiers[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Modifiers")); sModifiers[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Modifiers"));
AddControl(m_Controller[i], &(m_HalfPress[i]), sModifiers[i], "1/2 Press: ", CTL_L, i); AddControl(m_Controller[i], &(m_HalfPress[i]), sModifiers[i], "1/2 Press: ", CTL_HALFTRIGGER, i);
sStick[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Main Stick")); sStick[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Main Stick"));

15
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
View File

@ -267,9 +267,8 @@ void DInput_Read(int _numPad, SPADStatus* _pPADStatus)
int mainvalue = (dinput.diks[pad[_numPad].keyForControl[CTL_HALFMAIN]] & 0xFF) ? 40 : 100; int mainvalue = (dinput.diks[pad[_numPad].keyForControl[CTL_HALFMAIN]] & 0xFF) ? 40 : 100;
int subvalue = (dinput.diks[pad[_numPad].keyForControl[CTL_HALFSUB]] & 0xFF) ? 40 : 100; int subvalue = (dinput.diks[pad[_numPad].keyForControl[CTL_HALFSUB]] & 0xFF) ? 40 : 100;
int triggervalueL = (dinput.diks[pad[_numPad].keyForControl[CTL_TRIGGER_L]] & 0xFF) ? 100 : 255; int triggervalue = (dinput.diks[pad[_numPad].keyForControl[CTL_HALFTRIGGER]] & 0xFF) ? 100 : 255;
int triggervalueR = (dinput.diks[pad[_numPad].keyForControl[CTL_TRIGGER_R]] & 0xFF) ? 100 : 255;
// get the new keys // get the new keys
if (dinput.diks[pad[_numPad].keyForControl[CTL_MAINLEFT]] & 0xFF){_pPADStatus->stickX -= mainvalue;} if (dinput.diks[pad[_numPad].keyForControl[CTL_MAINLEFT]] & 0xFF){_pPADStatus->stickX -= mainvalue;}
@ -290,13 +289,13 @@ void DInput_Read(int _numPad, SPADStatus* _pPADStatus)
if (dinput.diks[pad[_numPad].keyForControl[CTL_L]] & 0xFF) if (dinput.diks[pad[_numPad].keyForControl[CTL_L]] & 0xFF)
{ {
_pPADStatus->button |= PAD_TRIGGER_L; _pPADStatus->button |= PAD_TRIGGER_L;
_pPADStatus->triggerLeft = triggervalueL; _pPADStatus->triggerLeft = triggervalue;
} }
if (dinput.diks[pad[_numPad].keyForControl[CTL_R]] & 0xFF) if (dinput.diks[pad[_numPad].keyForControl[CTL_R]] & 0xFF)
{ {
_pPADStatus->button |= PAD_TRIGGER_R; _pPADStatus->button |= PAD_TRIGGER_R;
_pPADStatus->triggerRight = triggervalueR; _pPADStatus->triggerRight = triggervalue;
} }
if (dinput.diks[pad[_numPad].keyForControl[CTL_A]] & 0xFF) if (dinput.diks[pad[_numPad].keyForControl[CTL_A]] & 0xFF)
@ -616,10 +615,9 @@ void LoadConfig()
DIK_C, DIK_C,
DIK_D, DIK_D,
DIK_RETURN, DIK_RETURN,
DIK_LCONTROL,
DIK_Q, DIK_Q,
DIK_LCONTROL,
DIK_W, DIK_W,
DIK_LCONTROL,
DIK_UP, //mainstick DIK_UP, //mainstick
DIK_DOWN, DIK_DOWN,
DIK_LEFT, DIK_LEFT,
@ -644,10 +642,9 @@ void LoadConfig()
XK_c, XK_c,
XK_d, XK_d,
XK_Return, XK_Return,
XK_Control_L,
XK_q, XK_q,
XK_Control_L,
XK_w, XK_w,
XK_Control_L,
XK_Up, //mainstick XK_Up, //mainstick
XK_Down, XK_Down,
XK_Left, XK_Left,

3
Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
View File

@ -26,9 +26,8 @@ enum
CTL_Y, CTL_Y,
CTL_Z, CTL_Z,
CTL_START, CTL_START,
CTL_TRIGGER_L, CTL_HALFTRIGGER,
CTL_L, CTL_L,
CTL_TRIGGER_R,
CTL_R, CTL_R,
CTL_MAINUP, CTL_MAINUP,
CTL_MAINDOWN, CTL_MAINDOWN,