X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=003f1737d8685268ce26efa71b80de7661ec5002;hb=9025b93159042e856af2fb1a1e7e5017f9fee99c;hp=237105addc1dbd69f6dd154763db00b8e27dbfdf;hpb=cc33f567ae1f9982d90a3d88c5b2ba88d1038e6e;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 237105a..003f173 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -575,38 +575,8 @@ static void updateKeys(void)
 	keys &= CONFIGURABLE_KEYS;
 	keys2 = keys;
 
-#if 1
-	/* FIXME: combos, player2 */
+	/* FIXME: player2 */
 	allActions[0] = in_update();
-#else
-	for (i = 0; i < 32; i++)
-	{
-		if (keys2 & (1 << i))
-		{
-			int pl, acts = currentConfig.KeyBinds[i];
-			if (!acts) continue;
-			pl = (acts >> 16) & 1;
-			if (kb_combo_keys & (1 << i))
-			{
-				int u = i+1, acts_c = acts & kb_combo_acts;
-				// let's try to find the other one
-				if (acts_c) {
-					for (; u < 32; u++)
-						if ( (keys2 & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
-							allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
-							keys2 &= ~((1 << i) | (1 << u));
-							break;
-						}
-				}
-				// add non-combo actions if combo ones were not found
-				if (!acts_c || u == 32)
-					allActions[pl] |= acts & ~kb_combo_acts;
-			} else {
-				allActions[pl] |= acts;
-			}
-		}
-	}
-#endif
 
 	PicoPad[0] = allActions[0] & 0xfff;
 	PicoPad[1] = allActions[1] & 0xfff;
@@ -834,7 +804,6 @@ void emu_Loop(void)
 	scaling_update();
 	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-	emu_findKeyBindCombos();
 
 	// pal/ntsc might have changed, reset related stuff
 	target_fps = Pico.m.pal ? 50 : 60;