combo_keys = combo_acts = 0;\r
for (act = 0; act < 32; act++)\r
{\r
combo_keys = combo_acts = 0;\r
for (act = 0; act < 32; act++)\r
{\r
+ int keyc = 0, keyc2 = 0;\r
if (act == 16 || act == 17) continue; // player2 flag\r
if (act == 16 || act == 17) continue; // player2 flag\r
- for (u = 0; u < 32; u++)\r
- if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;\r
+ for (u = 0; u < 32; u++)\r
+ if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;\r
+ }\r
+ else\r
+ {\r
+ for (u = 0; u < 32; u++)\r
+ if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1\r
+ (currentConfig.KeyBinds[u] & (1 << act))) keyc++;\r
+ for (u = 0; u < 32; u++)\r
+ if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2\r
+ (currentConfig.KeyBinds[u] & (1 << act))) keyc2++;\r
+ if (keyc2 > keyc) keyc = keyc2;\r
// printf("combo keys/acts: %08x %08x\n", combo_keys, combo_acts);\r
}\r
\r
// printf("combo keys/acts: %08x %08x\n", combo_keys, combo_acts);\r
}\r
\r
combo_keys = combo_acts = 0;
for (act = 0; act < 32; act++)
{
combo_keys = combo_acts = 0;
for (act = 0; act < 32; act++)
{
+ int keyc = 0, keyc2 = 0;
if (act == 16 || act == 17) continue; // player2 flag
if (act == 16 || act == 17) continue; // player2 flag
- for (u = 0; u < 32; u++)
- 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;
+ sceDisplayWaitVblankStart();
+
// loop?
while (engineState == PGS_Running)
{
// loop?
while (engineState == PGS_Running)
{
char *val = " never";
if (currentConfig.EmuOpt & 0x2000)
val = (currentConfig.EmuOpt & 0x10000) ? "sometimes" : " always";
char *val = " never";
if (currentConfig.EmuOpt & 0x2000)
val = (currentConfig.EmuOpt & 0x10000) ? "sometimes" : " always";
- text_out16(x, y, "Wait for vsync %s", val);
+ text_out16(x, y, "Wait for vsync (slow) %s", val);
static void dispmenu_loop_options(void)
{
static int menu_sel = 0;
static void dispmenu_loop_options(void)
{
static int menu_sel = 0;
- int menu_sel_max, is_32col = 0;
+ int menu_sel_max, is_32col = (Pico.video.reg[12]&1)^1;
unsigned long inp = 0;
menu_id selected_id;
unsigned long inp = 0;
menu_id selected_id;