From 14880b0232545da9d170a9b192cd8398abe2661b Mon Sep 17 00:00:00 2001
From: "XTra.KrazzY" <XTra.KrazzY@gmail.com>
Date: Thu, 25 Sep 2008 21:59:48 +0000
Subject: [PATCH] SimplePad fix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@701 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Plugin_PadSimple/Src/GUI/ConfigDlg.cpp        |  5 ++---
 Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 15 ++++++---------
 Source/Plugins/Plugin_PadSimple/Src/PadSimple.h   |  3 +--
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
index 67a1188325..ab50358736 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
@@ -38,10 +38,9 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
 	EVT_BUTTON(CTL_Y,ConfigDialog::OnButtonClick)
 	EVT_BUTTON(CTL_Z,ConfigDialog::OnButtonClick)
 	EVT_BUTTON(CTL_START,ConfigDialog::OnButtonClick)
-	EVT_BUTTON(CTL_TRIGGER_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_HALFTRIGGER,ConfigDialog::OnButtonClick)
 	EVT_BUTTON(CTL_MAINUP,ConfigDialog::OnButtonClick)
 	EVT_BUTTON(CTL_MAINDOWN,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"));
 
-		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"));
 
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index 8da6ac119b..6e44485b64 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -267,9 +267,8 @@ void DInput_Read(int _numPad, SPADStatus* _pPADStatus)
 
 	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 triggervalueL = (dinput.diks[pad[_numPad].keyForControl[CTL_TRIGGER_L]] & 0xFF) ? 100 : 255;
-	int triggervalueR = (dinput.diks[pad[_numPad].keyForControl[CTL_TRIGGER_R]] & 0xFF) ? 100 : 255;
-
+	int triggervalue = (dinput.diks[pad[_numPad].keyForControl[CTL_HALFTRIGGER]] & 0xFF) ? 100 : 255;
+	
 	// get the new keys
 	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)
 	{
 		_pPADStatus->button |= PAD_TRIGGER_L;
-		_pPADStatus->triggerLeft = triggervalueL;
+		_pPADStatus->triggerLeft = triggervalue;
 	}
 
 	if (dinput.diks[pad[_numPad].keyForControl[CTL_R]] & 0xFF)
 	{
 		_pPADStatus->button |= PAD_TRIGGER_R;
-		_pPADStatus->triggerRight = triggervalueR;
+		_pPADStatus->triggerRight = triggervalue;
 	}
 
 	if (dinput.diks[pad[_numPad].keyForControl[CTL_A]] & 0xFF)
@@ -616,10 +615,9 @@ void LoadConfig()
 		DIK_C,
 		DIK_D,
 		DIK_RETURN,
+		DIK_LCONTROL,
 		DIK_Q,
-		DIK_LCONTROL,
 		DIK_W,
-		DIK_LCONTROL,
 		DIK_UP,	//mainstick
 		DIK_DOWN,
 		DIK_LEFT,
@@ -644,10 +642,9 @@ void LoadConfig()
           XK_c,
           XK_d,
           XK_Return,
+		  XK_Control_L,
           XK_q,
-          XK_Control_L,
           XK_w,
-          XK_Control_L,
           XK_Up, //mainstick
           XK_Down,
           XK_Left, 
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
index a570cca093..0110242e80 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
@@ -26,9 +26,8 @@ enum
 	CTL_Y,
 	CTL_Z,
 	CTL_START,
-	CTL_TRIGGER_L,
+	CTL_HALFTRIGGER,
 	CTL_L,
-	CTL_TRIGGER_R,
 	CTL_R,
 	CTL_MAINUP,
 	CTL_MAINDOWN,