notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
final tweaks for 1.55 release
[picodrive.git]
/
platform
/
common
/
emu.c
diff --git
a/platform/common/emu.c
b/platform/common/emu.c
index
118dc38
..
167f2f0
100644
(file)
--- a/
platform/common/emu.c
+++ b/
platform/common/emu.c
@@
-407,8
+407,8
@@
int emu_reload_rom(char *rom_fname)
// valid CD image, check for BIOS..
\r
\r
// we need to have config loaded at this point
\r
// 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
cfg_loaded = 1;
\r
\r
if (PicoRegionOverride) {
\r
@@
-465,8
+465,8
@@
int emu_reload_rom(char *rom_fname)
if (!(PicoAHW & PAHW_MCD))
\r
memcpy(id_header, rom_data + 0x100, sizeof(id_header));
\r
if (!cfg_loaded) {
\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
}
\r
\r
lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
\r
@@
-613,10
+613,11
@@
int emu_read_config(int game, int no_defaults)
char cfg[512];
\r
int ret;
\r
\r
char cfg[512];
\r
int ret;
\r
\r
+ if (!no_defaults)
\r
+ emu_set_defconfig();
\r
+
\r
if (!game)
\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
make_config_cfg(cfg);
\r
ret = config_readsect(cfg, NULL);
\r
}
\r