diff options
author | Andrés | 2016-05-15 17:29:01 -0500 |
---|---|---|
committer | Andrés | 2016-05-15 17:29:01 -0500 |
commit | 05311a18fb23799776f9552614ef4c5fb5d852fa (patch) | |
tree | 93dfb321a3aae5421fdb3aef533987e271211d06 /frontend/plugin.c | |
parent | 93fed87bed7cc0bdc0f74e3f852282d938f7db4f (diff) | |
parent | 3b1a5e21b399fcb38c5d8ead3c16603f566d7ffa (diff) | |
download | pcsx_rearmed-05311a18fb23799776f9552614ef4c5fb5d852fa.tar.gz pcsx_rearmed-05311a18fb23799776f9552614ef4c5fb5d852fa.tar.bz2 pcsx_rearmed-05311a18fb23799776f9552614ef4c5fb5d852fa.zip |
Merge pull request #39 from dankcushions/master
Added multitap 1 & 2 core options - adds 3-8 player support.
Diffstat (limited to 'frontend/plugin.c')
-rw-r--r-- | frontend/plugin.c | 59 |
1 files changed, 37 insertions, 22 deletions
diff --git a/frontend/plugin.c b/frontend/plugin.c index 03fd47b..5663e6d 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -49,30 +49,45 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int); extern int CALLBACK SPUplayCDDAchannel(short *, int); /* PAD */ -static long PADreadPort1(PadDataS *pad) -{ - pad->controllerType = in_type1; - pad->buttonStatus = ~in_keystate; - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD || in_type1 == PSE_PAD_TYPE_NEGCON) { - pad->leftJoyX = in_a1[0]; - pad->leftJoyY = in_a1[1]; - pad->rightJoyX = in_a2[0]; - pad->rightJoyY = in_a2[1]; - } - return 0; +static long PADreadPort1(PadDataS *pad, int pad_index) { + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + if (multitap1 == 1) + pad->portMultitap = 1; + else + pad->portMultitap = 0; + + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) + { + pad->leftJoyX = in_analog_left[pad_index][0]; + pad->leftJoyY = in_analog_left[pad_index][1]; + pad->rightJoyX = in_analog_right[pad_index][0]; + pad->rightJoyY = in_analog_right[pad_index][1]; + } + return 0; } -static long PADreadPort2(PadDataS *pad) -{ - pad->controllerType = in_type2; - pad->buttonStatus = ~in_keystate >> 16; - if (in_type2 == PSE_PAD_TYPE_ANALOGPAD || in_type2 == PSE_PAD_TYPE_NEGCON) { - pad->leftJoyX = in_a3[0]; - pad->leftJoyY = in_a3[1]; - pad->rightJoyX = in_a4[0]; - pad->rightJoyY = in_a4[1]; - } - return 0; +static long PADreadPort2(PadDataS *pad, int pad_index) { + /* Temporary hack to avoid segfault when pad_index is a crazy number */ + if (pad_index <= 1 || pad_index > 8) { + pad_index = 1; + } + + pad->controllerType = in_type[pad_index]; + pad->buttonStatus = ~in_keystate[pad_index]; + if (multitap2 ==1 ) + pad->portMultitap = 2; + else + pad->portMultitap = 0; + + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) + { + pad->leftJoyX = in_analog_left[pad_index][0]; + pad->leftJoyY = in_analog_left[pad_index][1]; + pad->rightJoyX = in_analog_right[pad_index][0]; + pad->rightJoyY = in_analog_right[pad_index][1]; + } + return 0; } /* GPU */ |