X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=140c017d4edf6aca0bf99966875a9cd5551ad7d0;hb=334d9fb6543169acca1969b08f78d91870f4d22c;hp=ebc7c773ea5918baa8e9fb4bb026c6f27d11cb86;hpb=c7074ddb0258ab03b9329bef9930c28ba46ae6da;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index ebc7c77..140c017 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -322,6 +322,10 @@ static void system_announce(void)
 #endif
 	} else if (PicoAHW & PAHW_PICO) {
 		sys_name = "Pico";
+	} else if ((PicoAHW & (PAHW_32X|PAHW_MCD)) == (PAHW_32X|PAHW_MCD)) {
+		sys_name = "32X + Mega CD";
+		if ((Pico.m.hardware & 0xc0) == 0x80)
+			sys_name = "32X + Sega CD";
 	} else if (PicoAHW & PAHW_MCD) {
 		sys_name = "Mega CD";
 		if ((Pico.m.hardware & 0xc0) == 0x80)
@@ -348,6 +352,8 @@ static void do_region_override(const char *media_fname)
 
 int emu_reload_rom(const char *rom_fname_in)
 {
+	// use setting before rom config is loaded
+	int autoload = g_autostateld_opt;
 	char *rom_fname = NULL;
 	char ext[5];
 	enum media_type_e media_type;
@@ -491,7 +497,7 @@ int emu_reload_rom(const char *rom_fname_in)
 		emu_save_load_game(1, 1);
 
 	// state autoload?
-	if (g_autostateld_opt) {
+	if (autoload) {
 		int time, newest = 0, newest_slot = -1;
 		int slot;
 
@@ -572,7 +578,7 @@ void emu_prep_defconfig(void)
 	defaultConfig.EmuOpt    = 0x9d | EOPT_EN_CD_LEDS;
 	defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
 				  POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |
-				  POPT_EN_SVP_DRC|POPT_ACC_SPRITES |
+				  POPT_EN_DRC|POPT_ACC_SPRITES |
 				  POPT_EN_32X|POPT_EN_PWM;
 	defaultConfig.s_PsndRate = 44100;
 	defaultConfig.s_PicoRegion = 0; // auto
@@ -1306,7 +1312,6 @@ static void emu_loop_prep(void)
 		filter_old = currentConfig.filter;
 	}
 
-printf("-- gamma %d\n", currentConfig.gamma);
 	plat_target_gamma_set(currentConfig.gamma, 0);
 
 	pemu_loop_prep();