notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cd: fix copy-paste bug, comm issue
[picodrive.git]
/
platform
/
common
/
emu.c
diff --git
a/platform/common/emu.c
b/platform/common/emu.c
index
ebc7c77
..
140c017
100644
(file)
--- a/
platform/common/emu.c
+++ b/
platform/common/emu.c
@@
-322,6
+322,10
@@
static void system_announce(void)
#endif
\r
} else if (PicoAHW & PAHW_PICO) {
\r
sys_name = "Pico";
\r
#endif
\r
} else if (PicoAHW & PAHW_PICO) {
\r
sys_name = "Pico";
\r
+ } else if ((PicoAHW & (PAHW_32X|PAHW_MCD)) == (PAHW_32X|PAHW_MCD)) {
\r
+ sys_name = "32X + Mega CD";
\r
+ if ((Pico.m.hardware & 0xc0) == 0x80)
\r
+ sys_name = "32X + Sega CD";
\r
} else if (PicoAHW & PAHW_MCD) {
\r
sys_name = "Mega CD";
\r
if ((Pico.m.hardware & 0xc0) == 0x80)
\r
} else if (PicoAHW & PAHW_MCD) {
\r
sys_name = "Mega CD";
\r
if ((Pico.m.hardware & 0xc0) == 0x80)
\r
@@
-348,6
+352,8
@@
static void do_region_override(const char *media_fname)
\r
int emu_reload_rom(const char *rom_fname_in)
\r
{
\r
\r
int emu_reload_rom(const char *rom_fname_in)
\r
{
\r
+ // use setting before rom config is loaded
\r
+ int autoload = g_autostateld_opt;
\r
char *rom_fname = NULL;
\r
char ext[5];
\r
enum media_type_e media_type;
\r
char *rom_fname = NULL;
\r
char ext[5];
\r
enum media_type_e media_type;
\r
@@
-491,7
+497,7
@@
int emu_reload_rom(const char *rom_fname_in)
emu_save_load_game(1, 1);
\r
\r
// state autoload?
\r
emu_save_load_game(1, 1);
\r
\r
// state autoload?
\r
- if (
g_autostateld_opt
) {
\r
+ if (
autoload
) {
\r
int time, newest = 0, newest_slot = -1;
\r
int slot;
\r
\r
int time, newest = 0, newest_slot = -1;
\r
int slot;
\r
\r
@@
-572,7
+578,7
@@
void emu_prep_defconfig(void)
defaultConfig.EmuOpt = 0x9d | EOPT_EN_CD_LEDS;
\r
defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
\r
POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |
\r
defaultConfig.EmuOpt = 0x9d | EOPT_EN_CD_LEDS;
\r
defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |
\r
POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX |
\r
- POPT_EN_
SVP_
DRC|POPT_ACC_SPRITES |
\r
+ POPT_EN_DRC|POPT_ACC_SPRITES |
\r
POPT_EN_32X|POPT_EN_PWM;
\r
defaultConfig.s_PsndRate = 44100;
\r
defaultConfig.s_PicoRegion = 0; // auto
\r
POPT_EN_32X|POPT_EN_PWM;
\r
defaultConfig.s_PsndRate = 44100;
\r
defaultConfig.s_PicoRegion = 0; // auto
\r
@@
-1306,7
+1312,6
@@
static void emu_loop_prep(void)
filter_old = currentConfig.filter;
\r
}
\r
\r
filter_old = currentConfig.filter;
\r
}
\r
\r
-printf("-- gamma %d\n", currentConfig.gamma);
\r
plat_target_gamma_set(currentConfig.gamma, 0);
\r
\r
pemu_loop_prep();
\r
plat_target_gamma_set(currentConfig.gamma, 0);
\r
\r
pemu_loop_prep();
\r