X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=platform%2Fgp2x%2Femu.c;h=24496fd458f08b59d8957b587d9186b5798dfe9c;hb=fa1e5e2948e9b06dec3353081081173f7ae4d742;hp=36408f4807709023337f30c347e8f4889ca06e9e;hpb=e11c55481f1703298b3e7e213f73cec8a136f974;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 36408f4..24496fd 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -564,7 +564,7 @@ void emu_Deinit(void)
 }
 
 
-void osd_text(int x, int y, char *text)
+void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 
@@ -637,7 +637,7 @@ static int EmuScan8(unsigned int num, void *sdata)
 int localPal[0x100];
 static void (*vidCpyM2)(void *dest, void *src) = NULL;
 
-static void blit(char *fps, char *notice)
+static void blit(const char *fps, const char *notice)
 {
 	int emu_opt = currentConfig.EmuOpt;
 
@@ -764,6 +764,12 @@ static int check_save_file(void)
 	return 0;
 }
 
+static void emu_state_cb(const char *str)
+{
+	clearArea(0);
+	blit("", str);
+}
+
 static void RunEvents(unsigned int which)
 {
 	if(which & 0x1800) { // save or load (but not both)
@@ -777,8 +783,11 @@ static void RunEvents(unsigned int which)
 			clearArea(0);
 		}
 		if (do_it) {
-			blit("", (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
-			emu_SaveLoadGame(which & 0x1000, 0);
+			osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
+			PicoStateProgressCB = emu_state_cb;
+			gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2);
+			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+			PicoStateProgressCB = NULL;
 		}
 
 		reset_timing = 1;
@@ -1224,7 +1233,7 @@ if (Pico.m.frame_count == 31563) {
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
-		blit("", "Writing SRAM/BRAM..");
+		osd_text(4, 232, "Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
@@ -1233,9 +1242,14 @@ if (Pico.m.frame_count == 31563) {
 	if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80)) {
 		PicoOpt |= 0x10;
 		PicoFrameFull();
-		blit("", NULL); blit("", NULL); blit("", NULL); blit("", NULL); // be sure buffer3 gets updated
+		vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+		vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+		gp2x_video_setpalette(localPal, 0x40);
 		PicoOpt &= ~0x10;
 	}
+
+	// for menu bg
+	gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2);
 }