diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-12-04 06:43:30 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-12-04 06:43:30 +0000 |
| commit | 41e7b60e2e6397c4f8ae91495eb74728b6f562c7 (patch) | |
| tree | 5eef9e1efca8afd3db7de140aee70bbbe731e5f6 /plugins/dfinput/pad.c | |
| parent | aca57a03bd7fdb0e23ea4f6d979dfe7008648195 (diff) | |
| download | pcsxr-41e7b60e2e6397c4f8ae91495eb74728b6f562c7.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@38792 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput/pad.c')
| -rw-r--r-- | plugins/dfinput/pad.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c index ca54ebca..1fdda103 100644 --- a/plugins/dfinput/pad.c +++ b/plugins/dfinput/pad.c @@ -19,11 +19,7 @@ #include "pad.h" char *PSEgetLibName(void) { -#ifdef EPSXE - return _("Gamepad/Keyboard Input (ePSXe)"); -#else return _("Gamepad/Keyboard Input"); -#endif } uint32_t PSEgetLibType(void) { @@ -125,8 +121,6 @@ static void UpdateInput(void) { CheckKeyboard(); } -#ifndef EPSXE - static uint8_t stdpar[2][8] = { {0xFF, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80}, {0xFF, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80} @@ -255,10 +249,10 @@ unsigned char PADpoll(unsigned char value) { if (g.PadState[CurPad].PadMode == 1) { CmdLen = 8; - stdpar[CurPad][4] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][ANALOG_X]; - stdpar[CurPad][5] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][ANALOG_Y]; - stdpar[CurPad][6] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][ANALOG_X]; - stdpar[CurPad][7] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][ANALOG_Y]; + stdpar[CurPad][4] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][0]; + stdpar[CurPad][5] = g.PadState[CurPad].AnalogStatus[ANALOG_RIGHT][1]; + stdpar[CurPad][6] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][0]; + stdpar[CurPad][7] = g.PadState[CurPad].AnalogStatus[ANALOG_LEFT][1]; } else { CmdLen = 4; } @@ -329,25 +323,21 @@ unsigned char PADpoll(unsigned char value) { return buf[CurByte++]; } -#endif - static long PADreadPort(int num, PadDataS *pad) { UpdateInput(); pad->buttonStatus = (g.PadState[num].KeyStatus & g.PadState[num].JoyKeyStatus); -#ifdef EPSXE // ePSXe different from pcsx, swap bytes pad->buttonStatus = (pad->buttonStatus >> 8) | (pad->buttonStatus << 8); -#endif switch (g.cfg.PadDef[num].Type) { case PSE_PAD_TYPE_ANALOGPAD: // Analog Controller SCPH-1150 pad->controllerType = PSE_PAD_TYPE_ANALOGPAD; - pad->rightJoyX = g.PadState[num].AnalogStatus[ANALOG_RIGHT][ANALOG_X]; - pad->rightJoyY = g.PadState[num].AnalogStatus[ANALOG_RIGHT][ANALOG_Y]; - pad->leftJoyX = g.PadState[num].AnalogStatus[ANALOG_LEFT][ANALOG_X]; - pad->leftJoyY = g.PadState[num].AnalogStatus[ANALOG_LEFT][ANALOG_Y]; + pad->rightJoyX = g.PadState[num].AnalogStatus[ANALOG_RIGHT][0]; + pad->rightJoyY = g.PadState[num].AnalogStatus[ANALOG_RIGHT][1]; + pad->leftJoyX = g.PadState[num].AnalogStatus[ANALOG_LEFT][0]; + pad->leftJoyY = g.PadState[num].AnalogStatus[ANALOG_LEFT][1]; break; case PSE_PAD_TYPE_STANDARD: // Standard Pad SCPH-1080, SCPH-1150 |