#include "plat.h"\r
#include "posix.h"\r
#include <version.h>\r
+#include <revision.h>\r
\r
#include <pico/pico_int.h>\r
#include <pico/patch.h>\r
\r
-#define array_size(x) (sizeof(x) / sizeof(x[0]))\r
-\r
static char static_buff[64];\r
static char menu_error_msg[64] = { 0, };\r
static int menu_error_time = 0;\r
plat_video_menu_end();\r
}\r
\r
-static void cdload_progress_cb(int percent)\r
+static void cdload_progress_cb(const char *fname, int percent)\r
{\r
int ln, len = percent * g_screen_width / 100;\r
unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;\r
memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);\r
\r
smalltext_out16(1, 3 * me_sfont_h, "Processing CD image / MP3s", 0xffff);\r
- smalltext_out16(1, 4 * me_sfont_h, rom_fname_loaded, 0xffff);\r
+ smalltext_out16(1, 4 * me_sfont_h, fname, 0xffff);\r
dst += g_screen_width * me_sfont_h * 3;\r
\r
if (len > g_screen_width)\r
\r
void menu_romload_end(void)\r
{\r
- PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;\r
+ PicoCartLoadProgressCB = NULL;\r
+ PicoCDLoadProgressCB = NULL;\r
smalltext_out16(1, (cdload_called ? 6 : 3) * me_sfont_h,\r
"Starting emulation...", 0xffff);\r
plat_video_menu_end();\r
\r
state_check_slots();\r
\r
+ if (!(state_slot_flags & (1 << menu_sel)) && is_loading)\r
+ menu_sel = menu_sel_max;\r
+\r
for (;;)\r
{\r
draw_savestate_menu(menu_sel, is_loading);\r
}\r
}\r
\r
+#ifdef __GNUC__\r
+#define COMPILER "gcc " __VERSION__\r
+#else\r
+#define COMPILER\r
+#endif\r
+\r
static void draw_frame_debug(void)\r
{\r
char layer_str[48] = "layers: ";\r
\r
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
pemu_forced_frame(0);\r
- smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);\r
+ smalltext_out16(4, 1, "build: r" REVISION " "__DATE__ " " __TIME__ " " COMPILER, 0xffff);\r
smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
}\r
\r
{\r
case 0:\r
if (inp & PBTN_MOK)\r
- SekStepM68k();\r
+ PDebugCPUStep();\r
if (inp & PBTN_MA3) {\r
while (inp & PBTN_MA3)\r
inp = in_menu_wait_any(-1);\r