X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=eee255b72aa1e159a278202503f22b037e09058b;hb=4ee722a52cb0fb56260ccd3962537e5c772800e0;hp=89803ce5a125bb262331b2d51cc8b6e2b81d233b;hpb=61c4962abc49e430aabea5e565d93436a57cfa0a;p=pcsx_rearmed.git

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 89803ce5..eee255b7 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -37,12 +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_a1[2] = { 127, 127 }, in_a2[2] = { 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;
@@ -599,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;
@@ -614,7 +616,6 @@ static void update_input(void)
 	emu_set_action(emu_act);
 
 	in_keystate[0] = actions[IN_BINDTYPE_PLAYER12];
-
 }
 #else /* MAEMO */
 extern void update_input(void);