X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=a19329d8afdf067c1becf97ea0069648560ef9c8;hb=bc0420cd98650a27f9137fcc79c5a803f635ac0e;hp=c696d887fb66e3723ab2c8d37509e6667744b4bc;hpb=b3972d826fe31f82aa3382f80454e5d8ce895705;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index c696d88..a19329d 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -22,6 +22,7 @@
 #include "../common/fonts.h"
 #include "../common/emu.h"
 #include "../common/config.h"
+#include "../common/input.h"
 #include "../linux/sndout_oss.h"
 #include "cpuctrl.h"
 
@@ -123,12 +124,8 @@ void emu_Deinit(void)
 		SRam.changed = 0;
 	}
 
-	if (!(currentConfig.EmuOpt & 0x20)) {
-		config_writelrom(PicoConfigFile);
-#ifndef NO_SYNC
-		sync();
-#endif
-	}
+	if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG))
+		emu_writelrom();
 
 	free(PicoDraw2FB);
 
@@ -584,6 +581,14 @@ static void updateKeys(void)
 	keys &= CONFIGURABLE_KEYS;
 	keys2 = keys;
 
+#if 1
+	{
+		/* FIXME: combos */
+		int acts = in_update();
+		int pl = (acts >> 16) & 1;
+		allActions[pl] |= acts;
+	}
+#else
 	for (i = 0; i < 32; i++)
 	{
 		if (keys2 & (1 << i))
@@ -611,6 +616,7 @@ static void updateKeys(void)
 			}
 		}
 	}
+#endif
 
 	// add joy inputs
 	if (num_of_joys > 0)