// valid CD image, check for BIOS..\r
\r
// we need to have config loaded at this point\r
- ret = emu_read_config(1, 1);\r
- if (!ret) emu_read_config(0, 1);\r
+ ret = emu_read_config(1, 0);\r
+ if (!ret) emu_read_config(0, 0);\r
cfg_loaded = 1;\r
\r
if (PicoRegionOverride) {\r
if (!(PicoAHW & PAHW_MCD))\r
memcpy(id_header, rom_data + 0x100, sizeof(id_header));\r
if (!cfg_loaded) {\r
- ret = emu_read_config(1, 1);\r
- if (!ret) emu_read_config(0, 1);\r
+ ret = emu_read_config(1, 0);\r
+ if (!ret) emu_read_config(0, 0);\r
}\r
\r
lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
char cfg[512];\r
int ret;\r
\r
+ if (!no_defaults)\r
+ emu_set_defconfig();\r
+\r
if (!game)\r
{\r
- if (!no_defaults)\r
- emu_set_defconfig();\r
make_config_cfg(cfg);\r
ret = config_readsect(cfg, NULL);\r
}\r
\r
if (is_sram)\r
{\r
- romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");\r
+ romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP,\r
+ (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
if (load) {\r
if (try_ropen_file(saveFname)) return saveFname;\r
// try in current dir..\r
}\r
}\r
\r
-static void emu_msg_tray_open(void)\r
+static void emu_tray_open(void)\r
+{\r
+ engineState = PGS_TrayMenu;\r
+}\r
+\r
+static void emu_tray_close(void)\r
{\r
- emu_status_msg("CD tray opened");\r
+ emu_status_msg("CD tray closed.");\r
}\r
\r
void emu_reset_game(void)\r
\r
PicoInit();\r
PicoMessage = plat_status_msg_busy_next;\r
- PicoMCDopenTray = emu_msg_tray_open;\r
- PicoMCDcloseTray = menu_loop_tray;\r
+ PicoMCDopenTray = emu_tray_open;\r
+ PicoMCDcloseTray = emu_tray_close;\r
}\r
\r
void emu_finish(void)\r