X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=e679f5e65ebb1f493d3b96f4c1d2adb9d5c8dd9b;hb=fea1749d54845b0c8305d8210369ed45c7eb3e5d;hp=412dbc2cdabdeaad2e036ce46133be978ccd883a;hpb=93c18cb44bf9794c7c9bc93411c68880723320d1;p=libpicofe.git diff --git a/common/menu.c b/common/menu.c index 412dbc2..e679f5e 100644 --- a/common/menu.c +++ b/common/menu.c @@ -262,14 +262,17 @@ void menu_init(void) } // load custom font and selector (stored as 1st symbol in font table) - readpng(menu_font_data, "skin/font.png", READPNG_FONT); + emu_make_path(buff, "skin/font.png", sizeof(buff)); + readpng(menu_font_data, buff, READPNG_FONT); // default selector symbol is '>' memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2, me_mfont_w * me_mfont_h / 2); - readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR); + emu_make_path(buff, "skin/selector.png", sizeof(buff)); + readpng(menu_font_data, buff, READPNG_SELECTOR); // load custom colors - f = fopen("skin/skin.txt", "r"); + emu_make_path(buff, "skin/skin.txt", sizeof(buff)); + f = fopen(buff, "r"); if (f != NULL) { lprintf("found skin.txt\n"); @@ -324,11 +327,11 @@ static int me_count(const menu_entry *ent) return ret; } -static void me_draw(const menu_entry *entries, int sel) +static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void)) { const menu_entry *ent; int x, y, w = 0, h = 0; - int offs, opt_offs = 27 * me_mfont_w; + int offs, col2_offs = 27 * me_mfont_w; const char *name; int asel = 0; int i, n; @@ -353,9 +356,9 @@ static void me_draw(const menu_entry *entries, int sel) if (ent->beh != MB_NONE) { - if (wt > opt_offs) - opt_offs = wt + me_mfont_w; - wt = opt_offs; + if (wt > col2_offs) + col2_offs = wt + me_mfont_w; + wt = col2_offs; switch (ent->beh) { case MB_NONE: break; @@ -415,10 +418,10 @@ static void me_draw(const menu_entry *entries, int sel) case MB_NONE: break; case MB_OPT_ONOFF: - text_out16(x + opt_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF"); + text_out16(x + col2_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF"); break; case MB_OPT_RANGE: - text_out16(x + opt_offs, y, "%i", *(int *)ent->var); + text_out16(x + col2_offs, y, "%i", *(int *)ent->var); break; case MB_OPT_CUSTOM: case MB_OPT_CUSTONOFF: @@ -428,7 +431,7 @@ static void me_draw(const menu_entry *entries, int sel) if (ent->generate_name) name = ent->generate_name(ent->id, &offs); if (name != NULL) - text_out16(x + opt_offs + offs * me_mfont_w, y, "%s", name); + text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name); break; } @@ -446,11 +449,15 @@ static void me_draw(const menu_entry *entries, int sel) menu_error_msg[0] = 0; } + if (draw_more != NULL) + draw_more(); + plat_video_menu_end(); } -static int me_process(menu_entry *entry, int is_next) +static int me_process(menu_entry *entry, int is_next, int is_lr) { + int c; switch (entry->beh) { case MB_OPT_ONOFF: @@ -459,7 +466,8 @@ static int me_process(menu_entry *entry, int is_next) return 1; case MB_OPT_RANGE: case MB_OPT_CUSTRANGE: - *(int *)entry->var += is_next ? 1 : -1; + c = is_lr ? 10 : 1; + *(int *)entry->var += is_next ? c : -c; if (*(int *)entry->var < (int)entry->min) *(int *)entry->var = (int)entry->max; if (*(int *)entry->var > (int)entry->max) @@ -472,12 +480,12 @@ static int me_process(menu_entry *entry, int is_next) static void debug_menu_loop(void); -static void me_loop(menu_entry *menu, int *menu_sel) +static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void)) { int ret, inp, sel = *menu_sel, menu_sel_max; menu_sel_max = me_count(menu) - 1; - if (menu_sel_max < 1) { + if (menu_sel_max < 0) { lprintf("no enabled menu entries\n"); return; } @@ -486,12 +494,12 @@ static void me_loop(menu_entry *menu, int *menu_sel) sel++; /* make sure action buttons are not pressed on entering menu */ - me_draw(menu, sel); + me_draw(menu, sel, NULL); while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU)); for (;;) { - me_draw(menu, sel); + me_draw(menu, sel, draw_more); inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT| PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, 70); if (inp & (PBTN_MENU|PBTN_MBACK)) @@ -518,8 +526,9 @@ static void me_loop(menu_entry *menu, int *menu_sel) if ((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R)) debug_menu_loop(); - if (inp & (PBTN_LEFT|PBTN_RIGHT)) { /* multi choice */ - if (me_process(&menu[sel], (inp & PBTN_RIGHT) ? 1 : 0)) + if (inp & (PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R)) { /* multi choice */ + if (me_process(&menu[sel], (inp & (PBTN_RIGHT|PBTN_R)) ? 1 : 0, + inp & (PBTN_L|PBTN_R))) continue; } @@ -537,6 +546,9 @@ static void me_loop(menu_entry *menu, int *menu_sel) /* ***************************************** */ +/* platform specific options and handlers */ +#include "../gp2x/menu.c" + static void draw_menu_credits(void) { const char *creds, *p; @@ -949,7 +961,7 @@ static void state_check_slots(void) state_slot_flags = 0; for (slot = 0; slot < 10; slot++) { - if (emu_checkSaveFile(slot)) + if (emu_check_save_file(slot)) state_slot_flags |= 1 << slot; } } @@ -962,7 +974,7 @@ static void draw_savestate_bg(int slot) void *tmp_vram, *file; char *fname; - fname = emu_GetSaveFName(1, 0, slot); + fname = emu_get_save_fname(1, 0, slot); if (!fname) return; tmp_vram = malloc(sizeof(Pico.vram)); @@ -1067,7 +1079,7 @@ static int menu_loop_savestate(int is_loading) if (inp & PBTN_MOK) { // save/load if (menu_sel < 10) { state_slot = menu_sel; - if (emu_SaveLoadGame(is_loading, 0)) { + if (emu_save_load_game(is_loading, 0)) { me_update_msg(is_loading ? "Load failed" : "Save failed"); return 0; } @@ -1084,8 +1096,8 @@ static int menu_loop_savestate(int is_loading) static char *action_binds(int player_idx, int action_mask, int dev_id) { + int k, count, can_combo, type; const int *binds; - int k, count; static_buff[0] = 0; @@ -1094,21 +1106,30 @@ static char *action_binds(int player_idx, int action_mask, int dev_id) return static_buff; count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT); + can_combo = in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS); + + type = IN_BINDTYPE_EMU; + if (player_idx >= 0) { + can_combo = 0; + type = IN_BINDTYPE_PLAYER12; + } + if (player_idx == 1) + action_mask <<= 16; + for (k = 0; k < count; k++) { const char *xname; int len; - if (!(binds[k] & action_mask)) - continue; - if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx) + if (!(binds[IN_BIND_OFFS(k, type)] & action_mask)) continue; xname = in_get_key_name(dev_id, k); len = strlen(static_buff); if (len) { - strncat(static_buff, " + ", sizeof(static_buff) - len - 1); - len += 3; + strncat(static_buff, can_combo ? " + " : ", ", + sizeof(static_buff) - len - 1); + len += can_combo ? 3 : 2; } strncat(static_buff, xname, sizeof(static_buff) - len - 1); } @@ -1116,7 +1137,7 @@ static char *action_binds(int player_idx, int action_mask, int dev_id) return static_buff; } -static int count_bound_keys(int dev_id, int action_mask, int player_idx) +static int count_bound_keys(int dev_id, int action_mask, int bindtype) { const int *binds; int k, keys = 0; @@ -1129,13 +1150,8 @@ static int count_bound_keys(int dev_id, int action_mask, int player_idx) count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT); for (k = 0; k < count; k++) { - if (!(binds[k] & action_mask)) - continue; - - if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx) - continue; - - keys++; + if (binds[IN_BIND_OFFS(k, bindtype)] & action_mask) + keys++; } return keys; @@ -1144,6 +1160,7 @@ static int count_bound_keys(int dev_id, int action_mask, int player_idx) static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel, int dev_id, int dev_count, int is_bind) { + char buff[64], buff2[32]; const char *dev_name; int x, y, w, i; @@ -1175,15 +1192,19 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_ x = g_screen_width / 2 - w / 2; - if (dev_count > 1) { - text_out16(x, g_screen_height - 4 * me_mfont_h, "Viewing binds for:"); - text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name); + if (!is_bind) { + snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK)); + snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2, + in_get_key_name(-1, -PBTN_MA2)); + text_out16(x, g_screen_height - 4 * me_mfont_h, buff); } + else + text_out16(x, g_screen_height - 4 * me_mfont_h, "Press a button to bind/unbind"); - if (is_bind) - text_out16(x, g_screen_height - 2 * me_mfont_h, "Press a button to bind/unbind"); - else if (dev_count > 1) + if (dev_count > 1) { + text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name); text_out16(x, g_screen_height - 2 * me_mfont_h, "Press left/right for other devs"); + } plat_video_menu_end(); } @@ -1191,7 +1212,8 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx) { int i, sel = 0, menu_sel_max = opt_cnt - 1; - int dev_id, dev_count, kc, is_down, mkey, unbind; + int dev_id, dev_count, kc, is_down, mkey; + int unbind, bindtype, mask_shift; for (i = 0, dev_id = -1, dev_count = 0; i < IN_MAX_DEVS; i++) { if (in_get_dev_name(i, 1, 0) != NULL) { @@ -1206,10 +1228,15 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_ return; } + mask_shift = 0; + if (player_idx == 1) + mask_shift = 16; + bindtype = player_idx >= 0 ? IN_BINDTYPE_PLAYER12 : IN_BINDTYPE_EMU; + for (;;) { draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 0); - mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK, 100); + mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK|PBTN_MA2, 100); switch (mkey) { case PBTN_UP: sel--; if (sel < 0) sel = menu_sel_max; continue; case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue; @@ -1235,6 +1262,9 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_ return; while (in_menu_wait_any(30) & PBTN_MOK); break; + case PBTN_MA2: + in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype); + continue; default:continue; } @@ -1244,19 +1274,15 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_ for (is_down = 1; is_down; ) kc = in_update_keycode(&dev_id, &is_down, -1); - i = count_bound_keys(dev_id, opts[sel].mask, player_idx); + i = count_bound_keys(dev_id, opts[sel].mask << mask_shift, bindtype); unbind = (i > 0); /* allow combos if device supports them */ - if (i == 1 && in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS)) + if (i == 1 && bindtype == IN_BINDTYPE_EMU && + in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS)) unbind = 0; - in_bind_key(dev_id, kc, opts[sel].mask, unbind); - if (player_idx >= 0) { - /* FIXME */ - in_bind_key(dev_id, kc, 3 << 16, 1); - in_bind_key(dev_id, kc, player_idx << 16, 0); - } + in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind); } } @@ -1280,10 +1306,6 @@ me_bind_action me_ctrl_actions[15] = { "Z ", 0x0100 } }; -// player2_flag, reserved, ?, ?, -// ?, ?, fast forward, menu -// "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE", -// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE" me_bind_action emuctrl_actions[] = { { "Load State ", PEV_STATE_LOAD }, @@ -1364,7 +1386,9 @@ static menu_entry e_menu_keyconfig[] = static int menu_loop_keyconfig(menu_id id, int keys) { static int sel = 0; - me_loop(e_menu_keyconfig, &sel); + + me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, rom_loaded); + me_loop(e_menu_keyconfig, &sel, NULL); return 0; } @@ -1397,7 +1421,7 @@ static int mh_cdopt_ra(menu_id id, int keys) static menu_entry e_menu_cd_options[] = { - mee_onoff("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, 0x0400), + mee_onoff("CD LEDs", MA_CDOPT_LEDS, currentConfig.EmuOpt, EOPT_EN_CD_LEDS), mee_onoff("CDDA audio", MA_CDOPT_CDDA, PicoOpt, POPT_EN_MCD_CDDA), mee_onoff("PCM audio", MA_CDOPT_PCM, PicoOpt, POPT_EN_MCD_PCM), mee_cust ("ReadAhead buffer", MA_CDOPT_READAHEAD, mh_cdopt_ra, mgn_cdopt_ra), @@ -1410,7 +1434,7 @@ static menu_entry e_menu_cd_options[] = static int menu_loop_cd_options(menu_id id, int keys) { static int sel = 0; - me_loop(e_menu_cd_options, &sel); + me_loop(e_menu_cd_options, &sel, NULL); return 0; } @@ -1418,60 +1442,45 @@ static int menu_loop_cd_options(menu_id id, int keys) static menu_entry e_menu_adv_options[] = { - mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_USE_SRAM), + mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_EN_SRAM), mee_onoff ("Disable sprite limit", MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM), - mee_onoff ("Use second CPU for sound", MA_OPT_ARM940_SOUND, PicoOpt, POPT_EXT_FM), mee_onoff ("Emulate Z80", MA_OPT2_ENABLE_Z80, PicoOpt, POPT_EN_Z80), mee_onoff ("Emulate YM2612 (FM)", MA_OPT2_ENABLE_YM2612, PicoOpt, POPT_EN_FM), mee_onoff ("Emulate SN76496 (PSG)", MA_OPT2_ENABLE_SN76496,PicoOpt, POPT_EN_PSG), mee_onoff ("gzip savestates", MA_OPT2_GZIP_STATES, currentConfig.EmuOpt, EOPT_GZIP_SAVES), mee_onoff ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM, currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG), - mee_onoff ("RAM overclock", MA_OPT2_RAMTIMINGS, currentConfig.EmuOpt, EOPT_RAM_TIMINGS), - mee_onoff ("MMU hack", MA_OPT2_SQUIDGEHACK, currentConfig.EmuOpt, EOPT_MMUHACK), - mee_onoff ("SVP dynarec", MA_OPT2_SVP_DYNAREC, PicoOpt, POPT_EN_SVP_DRC), mee_onoff ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET), + mee_onoff ("Disable frame limiter", MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT), + MENU_GP2X_OPTIONS_ADV mee_end, }; static int menu_loop_adv_options(menu_id id, int keys) { static int sel = 0; - me_loop(e_menu_adv_options, &sel); + me_loop(e_menu_adv_options, &sel, NULL); return 0; } // ------------ gfx options menu ------------ -static const char *mgn_opt_scaling(menu_id id, int *offs) -{ - *offs = -13; - switch (currentConfig.scaling) { - default: return " OFF"; - case EOPT_SCALE_HW_H: return " hw horizontal"; - case EOPT_SCALE_HW_HV: return "hw horiz. + vert"; - case EOPT_SCALE_SW_H: return " sw horizontal"; - } -} - -static const char *mgn_aopt_gamma(menu_id id, int *offs) +static int mh_opt_render(menu_id id, int keys) { - sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); - return static_buff; + plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 1); + return 0; } static menu_entry e_menu_gfx_options[] = { - mee_range_cust("Scaling", MA_OPT_SCALING, currentConfig.scaling, 0, 3, mgn_opt_scaling), - mee_range_cust("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma), - mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, EOPT_A_SN_GAMMA), - mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_PSYNC), + mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer), + MENU_GP2X_OPTIONS_GFX mee_end, }; static int menu_loop_gfx_options(menu_id id, int keys) { static int sel = 0; - me_loop(e_menu_gfx_options, &sel); + me_loop(e_menu_gfx_options, &sel, NULL); return 0; } @@ -1479,20 +1488,6 @@ static int menu_loop_gfx_options(menu_id id, int keys) static menu_entry e_menu_options[]; -/* TODO: move to plat */ -static int mh_opt_render(menu_id id, int keys) -{ - if (keys & PBTN_LEFT) { - if (PicoOpt&0x10) PicoOpt&= ~0x10; - else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |= 0x80; - } else { - if (PicoOpt&0x10) return 0; - else if (!(currentConfig.EmuOpt &0x80))PicoOpt|= 0x10; - else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80; - } - return 0; -} - static int sndrate_prevnext(int rate, int dir) { static const int rates[] = { 8000, 11025, 16000, 22050, 44100 }; @@ -1587,14 +1582,14 @@ static int mh_saveloadcfg(menu_id id, int keys) switch (id) { case MA_OPT_SAVECFG: case MA_OPT_SAVECFG_GAME: - if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0)) + if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0)) me_update_msg("config saved"); else me_update_msg("failed to write config"); break; case MA_OPT_LOADCFG: - ret = emu_ReadConfig(1, 1); - if (!ret) ret = emu_ReadConfig(0, 1); + ret = emu_read_config(1, 1); + if (!ret) ret = emu_read_config(0, 1); if (ret) me_update_msg("config loaded"); else me_update_msg("failed to load config"); break; @@ -1605,15 +1600,11 @@ static int mh_saveloadcfg(menu_id id, int keys) return 1; } -static const char *mgn_opt_renderer(menu_id id, int *offs) +static int mh_restore_defaults(menu_id id, int keys) { - *offs = -6; - if (PicoOpt & POPT_ALT_RENDERER) - return " 8bit fast"; - else if (currentConfig.EmuOpt & 0x80) - return "16bit accurate"; - else - return " 8bit accurate"; + emu_set_defconfig(); + me_update_msg("defaults restored"); + return 1; } static const char *mgn_opt_fskip(menu_id id, int *offs) @@ -1688,9 +1679,8 @@ static menu_entry e_menu_options[] = mee_range ("Save slot", MA_OPT_SAVE_SLOT, state_slot, 0, 9), mee_range_cust("Frameskip", MA_OPT_FRAMESKIP, currentConfig.Frameskip, -1, 16, mgn_opt_fskip), mee_cust ("Region", MA_OPT_REGION, mh_opt_misc, mgn_opt_region), - mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer), - mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, 0x002), - mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, 0x004), + mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, EOPT_SHOW_FPS), + 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_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves), mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900), @@ -1700,6 +1690,7 @@ static menu_entry e_menu_options[] = mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg), mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg), mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg), + mee_handler ("Restore defaults", mh_restore_defaults), mee_end, }; @@ -1710,7 +1701,7 @@ static int menu_loop_options(menu_id id, int keys) me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded); me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current); - me_loop(e_menu_options, &sel); + me_loop(e_menu_options, &sel, NULL); if (PicoRegionOverride) // force setting possibly changed.. @@ -1961,7 +1952,7 @@ void menu_loop(void) plat_video_menu_enter(rom_loaded); in_set_blocking(1); - me_loop(e_menu_main, &sel); + me_loop(e_menu_main, &sel, menu_main_plat_draw); if (rom_loaded) { if (engineState == PGS_Menu) @@ -1985,7 +1976,7 @@ static int mh_tray_load_cd(menu_id id, int keys) if (ret_name == NULL) return 0; - cd_type = emu_cdCheck(NULL, ret_name); + cd_type = emu_cd_check(NULL, ret_name); if (cd_type != CIT_NOT_CD) ret = Insert_CD(ret_name, cd_type); if (ret != 0) { @@ -2019,7 +2010,7 @@ int menu_loop_tray(void) plat_video_menu_enter(rom_loaded); in_set_blocking(1); - me_loop(e_menu_tray, &sel); + me_loop(e_menu_tray, &sel, NULL); if (engineState != PGS_RestartRun) { engineState = PGS_RestartRun; @@ -2045,13 +2036,15 @@ void me_update_msg(const char *msg) // ------------ util ------------ -/* wiz for now, probably extend later */ +/* GP2X/wiz for now, probably extend later */ void menu_plat_setup(int is_wiz) { int i; - if (!is_wiz) + if (!is_wiz) { + me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0); return; + } me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0); me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);