notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unified menu wip and some reorganization for it
[libpicofe.git]
/
gp2x
/
emu.c
diff --git
a/gp2x/emu.c
b/gp2x/emu.c
index
c696d88
..
b9079a9
100644
(file)
--- a/
gp2x/emu.c
+++ b/
gp2x/emu.c
@@
-22,6
+22,7
@@
#include "../common/fonts.h"
\r
#include "../common/emu.h"
\r
#include "../common/config.h"
\r
#include "../common/fonts.h"
\r
#include "../common/emu.h"
\r
#include "../common/config.h"
\r
+#include "../common/input.h"
\r
#include "../linux/sndout_oss.h"
\r
#include "cpuctrl.h"
\r
\r
#include "../linux/sndout_oss.h"
\r
#include "cpuctrl.h"
\r
\r
@@
-123,12
+124,8
@@
void emu_Deinit(void)
SRam.changed = 0;
\r
}
\r
\r
SRam.changed = 0;
\r
}
\r
\r
- if (!(currentConfig.EmuOpt & 0x20)) {
\r
- config_writelrom(PicoConfigFile);
\r
-#ifndef NO_SYNC
\r
- sync();
\r
-#endif
\r
- }
\r
+ if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG))
\r
+ emu_writelrom();
\r
\r
free(PicoDraw2FB);
\r
\r
\r
free(PicoDraw2FB);
\r
\r
@@
-584,6
+581,10
@@
static void updateKeys(void)
keys &= CONFIGURABLE_KEYS;
\r
keys2 = keys;
\r
\r
keys &= CONFIGURABLE_KEYS;
\r
keys2 = keys;
\r
\r
+#if 1
\r
+ /* FIXME: combos, player2 */
\r
+ allActions[0] = in_update();
\r
+#else
\r
for (i = 0; i < 32; i++)
\r
{
\r
if (keys2 & (1 << i))
\r
for (i = 0; i < 32; i++)
\r
{
\r
if (keys2 & (1 << i))
\r
@@
-611,6
+612,7
@@
static void updateKeys(void)
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
+#endif
\r
\r
// add joy inputs
\r
if (num_of_joys > 0)
\r
\r
// add joy inputs
\r
if (num_of_joys > 0)
\r