bugfix/improvement

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@290 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-11-01 23:07:56 +00:00
parent 3ec29f016c
commit 1f4e9f147f
5 changed files with 60 additions and 15 deletions

View file

@ -794,11 +794,22 @@ static void find_combos(void)
combo_keys = combo_acts = 0;
for (act = 0; act < 32; act++)
{
int keyc = 0;
int keyc = 0, keyc2 = 0;
if (act == 16 || act == 17) continue; // player2 flag
for (u = 0; u < 32; u++)
if (act > 17)
{
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;
}
if (keyc > 1)
{
@ -867,6 +878,8 @@ void emu_Loop(void)
sound_prepare();
}
sceDisplayWaitVblankStart();
// loop?
while (engineState == PGS_Running)
{