notaz.gp2x.de
/
libpicofe.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cue support wip
[libpicofe.git]
/
common
/
emu.c
diff --git
a/common/emu.c
b/common/emu.c
index
feb3167
..
1bbdf35
100644
(file)
--- a/
common/emu.c
+++ b/
common/emu.c
@@
-164,6
+164,9
@@
int emu_cdCheck(int *pregion)
unsigned char buf[32];
\r
pm_file *cd_f;
\r
int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
\r
unsigned char buf[32];
\r
pm_file *cd_f;
\r
int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
\r
+ char ext[5];
\r
+
\r
+ get_ext(romFileName, ext);
\r
\r
cd_f = pm_open(romFileName);
\r
if (!cd_f) return 0; // let the upper level handle this
\r
\r
cd_f = pm_open(romFileName);
\r
if (!cd_f) return 0; // let the upper level handle this
\r
@@
-330,7
+333,7
@@
int emu_ReloadRom(void)
\r
// check for MegaCD image
\r
cd_state = emu_cdCheck(&cd_region);
\r
\r
// check for MegaCD image
\r
cd_state = emu_cdCheck(&cd_region);
\r
- if (cd_state
> 0
)
\r
+ if (cd_state
!= CIT_NOT_CD
)
\r
{
\r
PicoAHW |= PAHW_MCD;
\r
// valid CD image, check for BIOS..
\r
{
\r
PicoAHW |= PAHW_MCD;
\r
// valid CD image, check for BIOS..
\r
@@
-405,8
+408,8
@@
int emu_ReloadRom(void)
Pico.m.frame_count = 0;
\r
\r
// insert CD if it was detected
\r
Pico.m.frame_count = 0;
\r
\r
// insert CD if it was detected
\r
- if (cd_state
> 0
) {
\r
- ret = Insert_CD(romFileName, cd_state
== 2
);
\r
+ if (cd_state
!= CIT_NOT_CD
) {
\r
+ ret = Insert_CD(romFileName, cd_state);
\r
if (ret != 0) {
\r
sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
\r
lprintf("%s\n", menuErrorMsg);
\r
if (ret != 0) {
\r
sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
\r
lprintf("%s\n", menuErrorMsg);
\r