X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=eee255b72aa1e159a278202503f22b037e09058b;hb=de95fedd6981b4608cb78180e3bddde7e675223c;hp=ff3518eea76d255d0dd6b6e48fad7c0e3179620a;hpb=ace14ab3172ad90809a3cc5e8fe67d5cac9e294b;p=pcsx_rearmed.git diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index ff3518ee..eee255b7 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -37,11 +37,14 @@ #define HUD_HEIGHT 10 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; +unsigned short in_keystate[8]; +int in_state_gun; int in_enable_vibration; void *tsdev; void *pl_vout_buf; @@ -598,7 +601,7 @@ static void update_input(void) unsigned int emu_act; in_update(actions); - if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD) + if (in_type[0] == PSE_PAD_TYPE_ANALOGJOY || 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;