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

Ported windows changes to linux 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@703 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-09-26 05:49:33 +00:00
parent b632f019da
commit 7fcc9abe67
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,8 +453,7 @@ void X11_Read(int _numPAD, SPADStatus* _pPADStatus)
int mainvalue = (KeyStatus[CTL_HALFMAIN]) ? 40 : 100; int mainvalue = (KeyStatus[CTL_HALFMAIN]) ? 40 : 100;
int subvalue = (KeyStatus[CTL_HALFSUB]) ? 40 : 100; int subvalue = (KeyStatus[CTL_HALFSUB]) ? 40 : 100;
int triggervalueL = (KeyStatus[CTL_TRIGGER_L]) ? 100 : 255; int triggervalue = (KeyStatus[CTL_HALFTRIGGER]) ? 100 : 255;
int triggervalueR = (KeyStatus[CTL_TRIGGER_R]) ? 100 : 255;
if (KeyStatus[CTL_MAINLEFT]){_pPADStatus->stickX -= mainvalue;} if (KeyStatus[CTL_MAINLEFT]){_pPADStatus->stickX -= mainvalue;}
if (KeyStatus[CTL_MAINUP]){_pPADStatus->stickY += mainvalue;} if (KeyStatus[CTL_MAINUP]){_pPADStatus->stickY += mainvalue;}
@ -487,12 +486,12 @@ void X11_Read(int _numPAD, SPADStatus* _pPADStatus)
if (KeyStatus[CTL_L]) { if (KeyStatus[CTL_L]) {
_pPADStatus->button |= PAD_TRIGGER_L; _pPADStatus->button |= PAD_TRIGGER_L;
_pPADStatus->triggerLeft = triggervalueL; _pPADStatus->triggerLeft = triggervalue;
} }
if (KeyStatus[CTL_R]) { if (KeyStatus[CTL_R]) {
_pPADStatus->button |= PAD_TRIGGER_R; _pPADStatus->button |= PAD_TRIGGER_R;
_pPADStatus->triggerRight = triggervalueR; _pPADStatus->triggerRight = triggervalue;
} }
if (KeyStatus[CTL_START]){_pPADStatus->button |= PAD_BUTTON_START;} if (KeyStatus[CTL_START]){_pPADStatus->button |= PAD_BUTTON_START;}

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

@ -74,34 +74,6 @@ static const char* controlNames[] =
"D-Pad_right", "D-Pad_right",
}; };
// control human readable
static const char* userControlNames[] =
{
"A",
"B",
"X",
"Y",
"Z",
"Start",
"Analog", // Don't use
"L",
"R",
"Up",
"Down",
"Left",
"Right",
"Soft_main_switch", // Don't use
"Up",
"Down",
"Left",
"Right",
"Soft_sub_switch", // Don't use
"Up",
"Down",
"Left",
"Right",
};
struct SPads { struct SPads {
bool type; //keyboard = 0, xpad = 1 bool type; //keyboard = 0, xpad = 1
int XPad; //player# of the xpad int XPad; //player# of the xpad