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

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 8bc83af..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;
@@ -490,6 +496,30 @@ int emu_reload_rom(const char *rom_fname_in)
 	if (currentConfig.EmuOpt & EOPT_EN_SRAM)
 		emu_save_load_game(1, 1);
 
+	// state autoload?
+	if (autoload) {
+		int time, newest = 0, newest_slot = -1;
+		int slot;
+
+		for (slot = 0; slot < 10; slot++) {
+			if (emu_check_save_file(slot, &time)) {
+				if (time > newest) {
+					newest = time;
+					newest_slot = slot;
+				}
+			}
+		}
+
+		if (newest_slot >= 0) {
+			lprintf("autoload slot %d\n", newest_slot);
+			state_slot = newest_slot;
+			emu_save_load_game(1, 0);
+		}
+		else {
+			lprintf("no save to autoload.\n");
+		}
+	}
+
 	retval = 1;
 out:
 	if (menu_romload_started)
@@ -548,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
@@ -736,19 +766,25 @@ void update_movie(void)
 	}
 }
 
-static int try_ropen_file(const char *fname)
+static int try_ropen_file(const char *fname, int *time)
 {
+	struct stat st;
 	FILE *f;
 
 	f = fopen(fname, "rb");
 	if (f) {
+		if (time != NULL) {
+			*time = 0;
+			if (fstat(fileno(f), &st) == 0)
+				*time = (int)st.st_mtime;
+		}
 		fclose(f);
 		return 1;
 	}
 	return 0;
 }
 
-char *emu_get_save_fname(int load, int is_sram, int slot)
+char *emu_get_save_fname(int load, int is_sram, int slot, int *time)
 {
 	char *saveFname = static_buff;
 	char ext[16];
@@ -761,11 +797,11 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 		if (!load)
 			return saveFname;
 
-		if (try_ropen_file(saveFname))
+		if (try_ropen_file(saveFname, time))
 			return saveFname;
 
 		romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
-		if (try_ropen_file(saveFname))
+		if (try_ropen_file(saveFname, time))
 			return saveFname;
 	}
 	else
@@ -783,11 +819,11 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 		}
 		else {
 			romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);
-			if (try_ropen_file(saveFname))
+			if (try_ropen_file(saveFname, time))
 				return saveFname;
 
 			romfname_ext(saveFname, sizeof(static_buff), NULL, ext);
-			if (try_ropen_file(saveFname))
+			if (try_ropen_file(saveFname, time))
 				return saveFname;
 
 			// try the other ext
@@ -797,7 +833,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 			strcat(ext, ext_othr);
 
 			romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);
-			if (try_ropen_file(saveFname))
+			if (try_ropen_file(saveFname, time))
 				return saveFname;
 		}
 	}
@@ -807,7 +843,7 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 
 int emu_check_save_file(int slot, int *time)
 {
-	return emu_get_save_fname(1, 0, slot) ? 1 : 0;
+	return emu_get_save_fname(1, 0, slot, time) ? 1 : 0;
 }
 
 int emu_save_load_game(int load, int sram)
@@ -816,7 +852,7 @@ int emu_save_load_game(int load, int sram)
 	char *saveFname;
 
 	// make save filename
-	saveFname = emu_get_save_fname(load, sram, state_slot);
+	saveFname = emu_get_save_fname(load, sram, state_slot, NULL);
 	if (saveFname == NULL) {
 		if (!sram)
 			emu_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");
@@ -1276,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();