break;\r
}\r
continue;\r
- case PBTN_MBACK: return;\r
+ case PBTN_MBACK:\r
+ return;\r
case PBTN_MOK:\r
if (sel >= opt_cnt)\r
return;\r
- while (in_menu_wait_any(30) & PBTN_MOK);\r
+ while (in_menu_wait_any(30) & PBTN_MOK)\r
+ ;\r
break;\r
case PBTN_MA2:\r
in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))\r
unbind = 0;\r
\r
- in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind);\r
+ if (unbind)\r
+ in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
+\r
+ in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);\r
}\r
}\r
\r
{\r
static int sel = 0;\r
\r
- me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x != NULL);\r
+ me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL);\r
me_loop(e_menu_32x_options, &sel, NULL);\r
\r
return 0;\r
mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, EOPT_EN_SOUND),\r
mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
mee_enum_h ("Confirm savestate", MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),\r
- mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
+ mee_range ("", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler ("[Display options]", menu_loop_gfx_options),\r
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),\r
#ifndef NO_32X\r
static int menu_loop_options(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+ int i;\r
\r
+ i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);\r
+ e_menu_options[i].enabled = e_menu_options[i].name ? 1 : 0;\r
me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded);\r
me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
\r
\r
// ------------ util ------------\r
\r
-/* GP2X/wiz for now, probably extend later */\r
-void menu_plat_setup(int is_wiz)\r
-{\r
- int i;\r
-\r
- if (!is_wiz) {\r
- me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);\r
- e_menu_gfx_options[i].need_to_save = 0;\r
- return;\r
- }\r
-\r
- me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);\r
- me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);\r
- me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);\r
-\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);\r
- e_menu_gfx_options[i].max = 1; /* only off and sw */\r
- i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);\r
- e_menu_gfx_options[i].need_to_save = 0;\r
-}\r
-\r
/* hidden options for config engine only */\r
static menu_entry e_menu_hidden[] =\r
{\r