X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgizmondo%2Femu.c;h=152c64844a22fd720cbd0f4c2637210d6d8ad659;hb=5c129565f0646a1ac7f9c57fd3425f3246aecb84;hp=440a8de33e53b5e91846958c954cf8f693b4beea;hpb=c77ca79e899d9cff96f90a2c5b6a866cf02ed47e;p=picodrive.git

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index 440a8de..152c648 100644
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -104,7 +104,7 @@ void emu_Init(void)
 void emu_Deinit(void)
 {
 	// save SRAM
-	if((currentConfig.EmuOpt & 1) && SRam.changed) {
+	if ((currentConfig.EmuOpt & 1) && SRam.changed) {
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
@@ -523,11 +523,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)
+		{
+			for (u = 0; u < 32; u++)
+				if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+		}
+		else
 		{
-			if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+			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)
 		{
@@ -593,7 +604,7 @@ void emu_Loop(void)
 	{
 		int ret, snd_excess_add, stereo;
 		if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
-			sound_rerate(Pico.m.frame_count ? 1 : 0);
+			PsndRerate(Pico.m.frame_count ? 1 : 0);
 		}
 		stereo=(PicoOpt&8)>>3;
 		snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;