notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move CD tray handling out of emu loop
[picodrive.git]
/
platform
/
common
/
emu.c
diff --git
a/platform/common/emu.c
b/platform/common/emu.c
index
167f2f0
..
2e813d3
100644
(file)
--- a/
platform/common/emu.c
+++ b/
platform/common/emu.c
@@
-797,7
+797,8
@@
char *emu_get_save_fname(int load, int is_sram, int slot)
\r
if (is_sram)
\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
if (load) {
\r
if (try_ropen_file(saveFname)) return saveFname;
\r
// try in current dir..
\r
@@
-989,9
+990,14
@@
void emu_set_fastforward(int set_on)
}
\r
}
\r
\r
}
\r
}
\r
\r
-static void emu_
msg_
tray_open(void)
\r
+static void emu_tray_open(void)
\r
{
\r
{
\r
- emu_status_msg("CD tray opened");
\r
+ engineState = PGS_TrayMenu;
\r
+}
\r
+
\r
+static void emu_tray_close(void)
\r
+{
\r
+ emu_status_msg("CD tray closed.");
\r
}
\r
\r
void emu_reset_game(void)
\r
}
\r
\r
void emu_reset_game(void)
\r
@@
-1213,8
+1219,8
@@
void emu_init(void)
\r
PicoInit();
\r
PicoMessage = plat_status_msg_busy_next;
\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
}
\r
\r
void emu_finish(void)
\r