release 1.85

This commit is contained in:
notaz 2013-08-31 18:22:59 +03:00
parent 92dfd9afa6
commit 68af34fe20
11 changed files with 80 additions and 51 deletions

View file

@ -323,6 +323,10 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
Pico32xSetClocks(0, currentConfig.ssh2_khz * 1000);
return 1;
case MA_OPT2_GAMMA:
currentConfig.gamma = atoi(val);
return 1;
/* PSP */
case MA_OPT3_SCALE:
if (strcasecmp(var, "Scale factor") != 0) return 0;

View file

@ -348,6 +348,8 @@ static void do_region_override(const char *media_fname)
int emu_reload_rom(const char *rom_fname_in)
{
// use setting before rom config is loaded
int autoload = g_autostateld_opt;
char *rom_fname = NULL;
char ext[5];
enum media_type_e media_type;
@ -491,7 +493,7 @@ int emu_reload_rom(const char *rom_fname_in)
emu_save_load_game(1, 1);
// state autoload?
if (g_autostateld_opt) {
if (autoload) {
int time, newest = 0, newest_slot = -1;
int slot;

View file

@ -743,7 +743,7 @@ static menu_entry e_menu_options[] =
mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, EOPT_EN_SOUND),
mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),
mee_enum_h ("Confirm savestate", MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),
mee_range ("", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 1200),
mee_range ("", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 3200),
mee_handler ("[Display options]", menu_loop_gfx_options),
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),
#ifndef NO_32X

View file

@ -1,2 +1 @@
#define VERSION "1.81"
#define VERSION "1.85"