nJoy: Shoulder button fixed, I forgot to set a value for the pressure. Currently it set at max (0xFF)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@57 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
ef3a9832ce
commit
7f95ad831f
|
@ -206,10 +206,26 @@ void PAD_GetStatus(BYTE _numPAD, SPADStatus* _pPADStatus)
|
||||||
if ((sub_stick_y < deadzone2) || (sub_stick_y > deadzone)) _pPADStatus->substickY += sub_stick_y;
|
if ((sub_stick_y < deadzone2) || (sub_stick_y > deadzone)) _pPADStatus->substickY += sub_stick_y;
|
||||||
|
|
||||||
// Set buttons
|
// Set buttons
|
||||||
if (joystate[_numPAD].buttons[CTL_L_SHOULDER]) _pPADStatus->button|=PAD_TRIGGER_L;
|
if (joystate[_numPAD].buttons[CTL_L_SHOULDER])
|
||||||
if (joystate[_numPAD].buttons[CTL_R_SHOULDER]) _pPADStatus->button|=PAD_TRIGGER_R;
|
{
|
||||||
if (joystate[_numPAD].buttons[CTL_A_BUTTON]) _pPADStatus->button|=PAD_BUTTON_A;
|
_pPADStatus->button|=PAD_TRIGGER_L;
|
||||||
if (joystate[_numPAD].buttons[CTL_B_BUTTON]) _pPADStatus->button|=PAD_BUTTON_B;
|
_pPADStatus->triggerLeft = 255; // Perhaps support halfpress/pressure
|
||||||
|
}
|
||||||
|
if (joystate[_numPAD].buttons[CTL_R_SHOULDER])
|
||||||
|
{
|
||||||
|
_pPADStatus->button|=PAD_TRIGGER_R;
|
||||||
|
_pPADStatus->triggerRight = 255; // Perhaps support halfpress/pressure
|
||||||
|
}
|
||||||
|
if (joystate[_numPAD].buttons[CTL_A_BUTTON])
|
||||||
|
{
|
||||||
|
_pPADStatus->button|=PAD_BUTTON_A;
|
||||||
|
_pPADStatus->analogA = 255; // Perhaps support halfpress/pressure
|
||||||
|
}
|
||||||
|
if (joystate[_numPAD].buttons[CTL_B_BUTTON])
|
||||||
|
{
|
||||||
|
_pPADStatus->button|=PAD_BUTTON_B;
|
||||||
|
_pPADStatus->analogB = 255; // Perhaps support halfpress/pressure
|
||||||
|
}
|
||||||
if (joystate[_numPAD].buttons[CTL_X_BUTTON]) _pPADStatus->button|=PAD_BUTTON_X;
|
if (joystate[_numPAD].buttons[CTL_X_BUTTON]) _pPADStatus->button|=PAD_BUTTON_X;
|
||||||
if (joystate[_numPAD].buttons[CTL_Y_BUTTON]) _pPADStatus->button|=PAD_BUTTON_Y;
|
if (joystate[_numPAD].buttons[CTL_Y_BUTTON]) _pPADStatus->button|=PAD_BUTTON_Y;
|
||||||
if (joystate[_numPAD].buttons[CTL_Z_TRIGGER]) _pPADStatus->button|=PAD_TRIGGER_Z;
|
if (joystate[_numPAD].buttons[CTL_Z_TRIGGER]) _pPADStatus->button|=PAD_TRIGGER_Z;
|
||||||
|
|
Loading…
Reference in New Issue