X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Femu.c;h=e72ea7dd7aafc27386684da7e78b0653a7448388;hb=1f4e9f147fc079f0efe4c4f95c0c9549d3b41553;hp=3f645ed155f312fb80a6e066c4300200740da0ad;hpb=3ec29f016cdeb3100dbb433dd9041e81542765bd;p=picodrive.git

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index 3f645ed..e72ea7d 100644
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -794,11 +794,22 @@ static void find_combos(void)
 	combo_keys = combo_acts = 0;
 	for (act = 0; act < 32; act++)
 	{
-		int keyc = 0;
+		int keyc = 0, keyc2 = 0;
 		if (act == 16 || act == 17) continue; // player2 flag
-		for (u = 0; u < 32; u++)
+		if (act > 17)
 		{
-			if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+			for (u = 0; u < 32; u++)
+				if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+		}
+		else
+		{
+			for (u = 0; u < 32; u++)
+				if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
+					(currentConfig.KeyBinds[u] & (1 << act))) keyc++;
+			for (u = 0; u < 32; u++)
+				if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
+					(currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
+			if (keyc2 > keyc) keyc = keyc2;
 		}
 		if (keyc > 1)
 		{
@@ -867,6 +878,8 @@ void emu_Loop(void)
 		sound_prepare();
 	}
 
+	sceDisplayWaitVblankStart();
+
 	// loop?
 	while (engineState == PGS_Running)
 	{