X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=bd4eb70a774bb342eb44e452282c35b41ca020c4;hb=5354c909ec807c4ad0dc238370b9e4984888f7b6;hp=44fb5c800607832473818d2ae806ed2a1fc71c94;hpb=6b8796e2a8aae2d41aeec2be4d385b4905c8c19b;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index 44fb5c8..bd4eb70 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -17,10 +17,10 @@
 #include "plat.h"
 #include "posix.h"
 #include <version.h>
+#include <revision.h>
 
 #include <pico/pico_int.h>
 #include <pico/patch.h>
-#include <zlib/zlib.h>
 
 #define array_size(x) (sizeof(x) / sizeof(x[0]))
 
@@ -971,8 +971,8 @@ static void draw_savestate_bg(int slot)
 	struct PicoVideo tmp_pv;
 	unsigned short tmp_cram[0x40];
 	unsigned short tmp_vsram[0x40];
-	void *tmp_vram, *file;
-	char *fname;
+	void *tmp_vram;
+	const char *fname;
 
 	fname = emu_get_save_fname(1, 0, slot);
 	if (!fname) return;
@@ -985,28 +985,7 @@ static void draw_savestate_bg(int slot)
 	memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));
 	memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));
 
-	if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {
-		file = gzopen(fname, "rb");
-		emu_setSaveStateCbs(1);
-	} else {
-		file = fopen(fname, "rb");
-		emu_setSaveStateCbs(0);
-	}
-
-	if (file) {
-		if (PicoAHW & PAHW_MCD) {
-			PicoCdLoadStateGfx(file);
-		} else {
-			areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file
-			areaRead(Pico.vram, 1, sizeof(Pico.vram), file);
-			areaSeek(file, 0x2000, SEEK_CUR);
-			areaRead(Pico.cram, 1, sizeof(Pico.cram), file);
-			areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file);
-			areaSeek(file, 0x221a0, SEEK_SET);
-			areaRead(&Pico.video, 1, sizeof(Pico.video), file);
-		}
-		areaClose(file);
-	}
+	PicoStateLoadVDP(fname);
 
 	/* do a frame and fetch menu bg */
 	pemu_forced_frame(POPT_EN_SOFTSCALE);
@@ -1058,6 +1037,9 @@ static int menu_loop_savestate(int is_loading)
 
 	state_check_slots();
 
+	if (!(state_slot_flags & (1 << menu_sel)) && is_loading)
+		menu_sel = menu_sel_max;
+
 	for (;;)
 	{
 		draw_savestate_menu(menu_sel, is_loading);
@@ -1685,8 +1667,8 @@ static menu_entry e_menu_options[] =
 	mee_cust      ("Confirm savestate",        MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),
 	mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),
 	mee_handler   ("[Display options]",        menu_loop_gfx_options),
-	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
 	mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),
+	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
 	mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),
 	mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),
 	mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg),
@@ -1758,6 +1740,12 @@ static void draw_text_debug(const char *str, int skip, int from)
 	}
 }
 
+#ifdef __GNUC__
+#define COMPILER "gcc " __VERSION__
+#else
+#define COMPILER
+#endif
+
 static void draw_frame_debug(void)
 {
 	char layer_str[48] = "layers:             ";
@@ -1768,7 +1756,7 @@ static void draw_frame_debug(void)
 
 	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
 	pemu_forced_frame(0);
-	smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);
+	smalltext_out16(4, 1, "build: r" REVISION "  "__DATE__ " " __TIME__ " " COMPILER, 0xffff);
 	smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);
 }
 
@@ -1985,8 +1973,7 @@ static int mh_tray_nothing(menu_id id, int keys)
 
 static menu_entry e_menu_tray[] =
 {
-	mee_label  ("The unit is about to"),
-	mee_label  ("close the CD tray."),
+	mee_label  ("The CD tray has opened."),
 	mee_label  (""),
 	mee_label  (""),
 	mee_handler("Load CD image",  mh_tray_load_cd),