X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fgizmondo%2Femu.c;h=152c64844a22fd720cbd0f4c2637210d6d8ad659;hb=8022f53da61b8e70420a3bac97250119bbe26457;hp=73c01dcc4d13831d8a3a3996898117d1813b687e;hpb=9d917eea21607c7c239d4b0cd850d660c0c8e4c5;p=picodrive.git

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index 73c01dc..152c648 100644
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -523,11 +523,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)
 		{