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_lib.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_lib.c')
| -rw-r--r-- | frontend/plugin_lib.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 237a5eb..ad2f49b 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -36,9 +36,11 @@ #define HUD_HEIGHT 10 -int in_type1, in_type2; -int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 }; -int in_a3[2] = { 127, 127 }, in_a4[2] = { 127, 127 }; +int in_type[8]; +int multitap1; +int multitap2; +int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }}; +int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }}; int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }}; int in_adev_is_nublike[2]; int in_keystate, in_state_gun; @@ -561,7 +563,7 @@ static void update_analog_nub_adjust(int *x_, int *y_) static void update_analogs(void) { - int *nubp[2] = { in_a1, in_a2 }; + int *nubp[2] = { in_analog_left[0], in_analog_right[0] }; int vals[2]; int i, a, v, ret; @@ -598,7 +600,7 @@ static void update_input(void) unsigned int emu_act; in_update(actions); - if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) + if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD) update_analogs(); emu_act = actions[IN_BINDTYPE_EMU]; in_state_gun = (emu_act & SACTION_GUN_MASK) >> SACTION_GUN_TRIGGER; @@ -612,7 +614,7 @@ static void update_input(void) } emu_set_action(emu_act); - in_keystate = actions[IN_BINDTYPE_PLAYER12]; + in_keystate[0] = actions[IN_BINDTYPE_PLAYER12]; } #else /* MAEMO */ extern void update_input(void); |