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

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 89803ce5..5a01608d 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -37,12 +37,15 @@
 #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_mouse[8][2];
+int in_state_gun;
 int in_enable_vibration;
 void *tsdev;
 void *pl_vout_buf;
@@ -398,6 +401,8 @@ static void pl_vout_flip(const void *vram, int stride, int bgr24, int w, int h)
 #endif
 	else
 	{
+		src = (void *)((uintptr_t)src & ~3); // align for the blitter
+
 		for (; h1-- > 0; dest += dstride * 2, src += stride)
 		{
 			bgr555_to_rgb565(dest, src, w * 2);
@@ -599,7 +604,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 +619,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);
@@ -673,6 +677,7 @@ void pl_frame_limit(void)
 				hud_msg[0] = 0;
 		}
 		tv_old = now;
+		//new_dynarec_print_stats();
 	}
 #ifdef PCNT
 	static int ya_vsync_count;