X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Femu.c;h=9535bfd236561992f6192fccf5fbda8b8215af3b;hb=refs%2Ftags%2Fv1.92;hp=7f375a3c593bcbe74eee221ab927a323858dfbb7;hpb=f7e40c9b2e6d5ca446cb8c2edf9e7601dd9c97cd;p=picodrive.git

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 7f375a3..9535bfd 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -889,7 +889,7 @@ int emu_save_load_game(int load, int sram)
 		{
 			if (PicoOpt & POPT_EN_MCD_RAMCART) {
 				sram_size = 0x12000;
-				sram_data = SRam.data;
+				sram_data = Pico.sv.data;
 				if (sram_data)
 					memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);
 			} else {
@@ -898,11 +898,11 @@ int emu_save_load_game(int load, int sram)
 				truncate  = 0; // the .brm may contain RAM cart data after normal brm
 			}
 		} else {
-			sram_size = SRam.size;
-			sram_data = SRam.data;
+			sram_size = Pico.sv.size;
+			sram_data = Pico.sv.data;
 		}
 		if (sram_data == NULL)
-			return 0; // SRam forcefully disabled for this game
+			return 0; // cart saves forcefully disabled for this game
 
 		if (load)
 		{
@@ -973,6 +973,9 @@ void emu_set_fastforward(int set_on)
 		currentConfig.EmuOpt = set_EmuOpt;
 		PsndRerate(1);
 		is_on = 0;
+		// mainly to unbreak pcm
+		if (PicoAHW & PAHW_MCD)
+			pcd_state_loaded();
 	}
 }
 
@@ -1138,6 +1141,8 @@ static void run_events_ui(unsigned int which)
 		emu_status_msg("SAVE SLOT %i [%s]", state_slot,
 			emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");
 	}
+	if (which & PEV_RESET)
+		emu_reset_game();
 	if (which & PEV_MENU)
 		engineState = PGS_Menu;
 }
@@ -1257,9 +1262,9 @@ void emu_init(void)
 void emu_finish(void)
 {
 	// save SRAM
-	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
+	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {
 		emu_save_load_game(0, 1);
-		SRam.changed = 0;
+		Pico.sv.changed = 0;
 	}
 
 	if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG)) {
@@ -1427,7 +1432,7 @@ void emu_loop(void)
 			printf("%s\n", fpsbuff);
 #else
 			if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
-				sprintf(fpsbuff, "%02i/%02i  ", frames_shown, frames_done);
+				snprintf(fpsbuff, 8, "%02i/%02i  ", frames_shown, frames_done);
 #endif
 			frames_shown = frames_done = 0;
 			timestamp_fps_x3 += ms_to_ticks(1000) * 3;
@@ -1509,10 +1514,10 @@ void emu_loop(void)
 	emu_set_fastforward(0);
 
 	// save SRAM
-	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
+	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && Pico.sv.changed) {
 		plat_status_msg_busy_first("Writing SRAM/BRAM...");
 		emu_save_load_game(0, 1);
-		SRam.changed = 0;
+		Pico.sv.changed = 0;
 	}
 
 	pemu_loop_end();