X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=c2f41090468bcbca8f3efdd1a05fd764d0cd8e0d;hb=8b78786e0f68a1e0e4331dc5f02eac468c99df11;hp=4098bd25dcdd923fa1fb495057b2fd83cb16feb4;hpb=b7d64dbdb78425b501093dfb137072459b5b3f0f;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 4098bd2..c2f4109 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -444,6 +444,10 @@ int emu_reload_rom(const char *rom_fname_in)
 		break;
 	}
 
+	// make quirks visible in UI
+	if (PicoQuirks & PQUIRK_FORCE_6BTN)
+		currentConfig.input_dev0 = PICO_INPUT_PAD_6BTN;
+
 	menu_romload_end();
 	menu_romload_started = 0;
 
@@ -455,9 +459,11 @@ int emu_reload_rom(const char *rom_fname_in)
 	// additional movie stuff
 	if (movie_data)
 	{
-		if (movie_data[0x14] == '6')
-		     PicoOpt |=  POPT_6BTN_PAD; // 6 button pad
-		else PicoOpt &= ~POPT_6BTN_PAD;
+		enum input_device indev = (movie_data[0x14] == '6') ?
+			PICO_INPUT_PAD_6BTN : PICO_INPUT_PAD_3BTN;
+		PicoSetInputDevice(0, indev);
+		PicoSetInputDevice(1, indev);
+
 		PicoOpt |= POPT_DIS_VDP_FIFO; // no VDP fifo timing
 		if (movie_data[0xF] >= 'A') {
 			if (movie_data[0x16] & 0x80) {
@@ -550,6 +556,8 @@ void emu_prep_defconfig(void)
 	defaultConfig.s_PicoCDBuffers = 0;
 	defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;
 	defaultConfig.Frameskip = -1; // auto
+	defaultConfig.input_dev0 = PICO_INPUT_PAD_3BTN;
+	defaultConfig.input_dev1 = PICO_INPUT_PAD_3BTN;
 	defaultConfig.volume = 50;
 	defaultConfig.gamma = 100;
 	defaultConfig.scaling = 0;
@@ -1370,10 +1378,8 @@ void emu_loop(void)
 			sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);
 			printf("%s\n", fpsbuff);
 #else
-			if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {
-				sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);
-				if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }
-			}
+			if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
+				sprintf(fpsbuff, "%02i/%02i  ", frames_shown, frames_done);
 #endif
 			frames_shown = frames_done = 0;
 			timestamp_fps += ms_to_ticks(1000);