X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=b9079a925112ee75569db477e92b59f7828b0f32;hb=24b24674aedbdcb4432ab2ed823c3d9c97852da4;hp=aef34b0d9f2888c4f79523bd9128810b40633cad;hpb=7f3b59cfbc4a85e2b2f036b0ae3fce09a94ed919;p=libpicofe.git diff --git a/gp2x/emu.c b/gp2x/emu.c index aef34b0..b9079a9 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" @@ -580,6 +581,10 @@ static void updateKeys(void) keys &= CONFIGURABLE_KEYS; keys2 = keys; +#if 1 + /* FIXME: combos, player2 */ + allActions[0] = in_update(); +#else for (i = 0; i < 32; i++) { if (keys2 & (1 << i)) @@ -607,6 +612,7 @@ static void updateKeys(void) } } } +#endif // add joy inputs if (num_of_joys > 0)