}\r
\r
// load custom font and selector (stored as 1st symbol in font table)\r
- readpng(menu_font_data, "skin/font.png", READPNG_FONT);\r
+ emu_make_path(buff, "skin/font.png", sizeof(buff));\r
+ readpng(menu_font_data, buff, READPNG_FONT);\r
// default selector symbol is '>'\r
memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
me_mfont_w * me_mfont_h / 2);\r
- readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);\r
+ emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
+ readpng(menu_font_data, buff, READPNG_SELECTOR);\r
\r
// load custom colors\r
- f = fopen("skin/skin.txt", "r");\r
+ emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
+ f = fopen(buff, "r");\r
if (f != NULL)\r
{\r
lprintf("found skin.txt\n");\r
{\r
const menu_entry *ent;\r
int x, y, w = 0, h = 0;\r
- int offs, opt_offs = 27 * me_mfont_w;\r
+ int offs, col2_offs = 27 * me_mfont_w;\r
const char *name;\r
int asel = 0;\r
int i, n;\r
\r
if (ent->beh != MB_NONE)\r
{\r
- if (wt > opt_offs)\r
- opt_offs = wt + me_mfont_w;\r
- wt = opt_offs;\r
+ if (wt > col2_offs)\r
+ col2_offs = wt + me_mfont_w;\r
+ wt = col2_offs;\r
\r
switch (ent->beh) {\r
case MB_NONE: break;\r
case MB_NONE:\r
break;\r
case MB_OPT_ONOFF:\r
- text_out16(x + opt_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");\r
+ text_out16(x + col2_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");\r
break;\r
case MB_OPT_RANGE:\r
- text_out16(x + opt_offs, y, "%i", *(int *)ent->var);\r
+ text_out16(x + col2_offs, y, "%i", *(int *)ent->var);\r
break;\r
case MB_OPT_CUSTOM:\r
case MB_OPT_CUSTONOFF:\r
if (ent->generate_name)\r
name = ent->generate_name(ent->id, &offs);\r
if (name != NULL)\r
- text_out16(x + opt_offs + offs * me_mfont_w, y, "%s", name);\r
+ text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name);\r
break;\r
}\r
\r
state_slot_flags = 0;\r
\r
for (slot = 0; slot < 10; slot++) {\r
- if (emu_checkSaveFile(slot))\r
+ if (emu_check_save_file(slot))\r
state_slot_flags |= 1 << slot;\r
}\r
}\r
void *tmp_vram, *file;\r
char *fname;\r
\r
- fname = emu_GetSaveFName(1, 0, slot);\r
+ fname = emu_get_save_fname(1, 0, slot);\r
if (!fname) return;\r
\r
tmp_vram = malloc(sizeof(Pico.vram));\r
}\r
\r
/* do a frame and fetch menu bg */\r
- emu_forcedFrame(POPT_EN_SOFTSCALE);\r
+ pemu_forced_frame(POPT_EN_SOFTSCALE);\r
plat_video_menu_enter(1);\r
\r
memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
if (inp & PBTN_MOK) { // save/load\r
if (menu_sel < 10) {\r
state_slot = menu_sel;\r
- if (emu_SaveLoadGame(is_loading, 0)) {\r
+ if (emu_save_load_game(is_loading, 0)) {\r
me_update_msg(is_loading ? "Load failed" : "Save failed");\r
return 0;\r
}\r
\r
static char *action_binds(int player_idx, int action_mask, int dev_id)\r
{\r
+ int k, count, can_combo, type;\r
const int *binds;\r
- int k, count;\r
\r
static_buff[0] = 0;\r
\r
return static_buff;\r
\r
count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);\r
+ can_combo = in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS);\r
+\r
+ type = IN_BINDTYPE_EMU;\r
+ if (player_idx >= 0) {\r
+ can_combo = 0;\r
+ type = IN_BINDTYPE_PLAYER12;\r
+ }\r
+ if (player_idx == 1)\r
+ action_mask <<= 16;\r
+\r
for (k = 0; k < count; k++)\r
{\r
const char *xname;\r
int len;\r
- if (!(binds[k] & action_mask))\r
- continue;\r
\r
- if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)\r
+ if (!(binds[IN_BIND_OFFS(k, type)] & action_mask))\r
continue;\r
\r
xname = in_get_key_name(dev_id, k);\r
len = strlen(static_buff);\r
if (len) {\r
- strncat(static_buff, " + ", sizeof(static_buff) - len - 1);\r
- len += 3;\r
+ strncat(static_buff, can_combo ? " + " : ", ",\r
+ sizeof(static_buff) - len - 1);\r
+ len += can_combo ? 3 : 2;\r
}\r
strncat(static_buff, xname, sizeof(static_buff) - len - 1);\r
}\r
return static_buff;\r
}\r
\r
-static int count_bound_keys(int dev_id, int action_mask, int player_idx)\r
+static int count_bound_keys(int dev_id, int action_mask, int bindtype)\r
{\r
const int *binds;\r
int k, keys = 0;\r
count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);\r
for (k = 0; k < count; k++)\r
{\r
- if (!(binds[k] & action_mask))\r
- continue;\r
-\r
- if (player_idx >= 0 && ((binds[k] >> 16) & 3) != player_idx)\r
- continue;\r
-\r
- keys++;\r
+ if (binds[IN_BIND_OFFS(k, bindtype)] & action_mask)\r
+ keys++;\r
}\r
\r
return keys;\r
static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx,\r
int sel, int dev_id, int dev_count, int is_bind)\r
{\r
+ char buff[64], buff2[32];\r
const char *dev_name;\r
int x, y, w, i;\r
\r
\r
x = g_screen_width / 2 - w / 2;\r
\r
- if (dev_count > 1) {\r
- text_out16(x, g_screen_height - 4 * me_mfont_h, "Viewing binds for:");\r
- text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);\r
+ if (!is_bind) {\r
+ snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK));\r
+ snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2,\r
+ in_get_key_name(-1, -PBTN_MA2));\r
+ text_out16(x, g_screen_height - 4 * me_mfont_h, buff);\r
}\r
+ else\r
+ text_out16(x, g_screen_height - 4 * me_mfont_h, "Press a button to bind/unbind");\r
\r
- if (is_bind)\r
- text_out16(x, g_screen_height - 2 * me_mfont_h, "Press a button to bind/unbind");\r
- else if (dev_count > 1)\r
+ if (dev_count > 1) {\r
+ text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);\r
text_out16(x, g_screen_height - 2 * me_mfont_h, "Press left/right for other devs");\r
+ }\r
\r
plat_video_menu_end();\r
}\r
static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)\r
{\r
int i, sel = 0, menu_sel_max = opt_cnt - 1;\r
- int dev_id, dev_count, kc, is_down, mkey, unbind;\r
+ int dev_id, dev_count, kc, is_down, mkey;\r
+ int unbind, bindtype, mask_shift;\r
\r
for (i = 0, dev_id = -1, dev_count = 0; i < IN_MAX_DEVS; i++) {\r
if (in_get_dev_name(i, 1, 0) != NULL) {\r
return;\r
}\r
\r
+ mask_shift = 0;\r
+ if (player_idx == 1)\r
+ mask_shift = 16;\r
+ bindtype = player_idx >= 0 ? IN_BINDTYPE_PLAYER12 : IN_BINDTYPE_EMU;\r
+\r
for (;;)\r
{\r
draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 0);\r
- mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK, 100);\r
+ mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK|PBTN_MA2, 100);\r
switch (mkey) {\r
case PBTN_UP: sel--; if (sel < 0) sel = menu_sel_max; continue;\r
case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;\r
return;\r
while (in_menu_wait_any(30) & PBTN_MOK);\r
break;\r
+ case PBTN_MA2:\r
+ in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
+ continue;\r
default:continue;\r
}\r
\r
for (is_down = 1; is_down; )\r
kc = in_update_keycode(&dev_id, &is_down, -1);\r
\r
- i = count_bound_keys(dev_id, opts[sel].mask, player_idx);\r
+ i = count_bound_keys(dev_id, opts[sel].mask << mask_shift, bindtype);\r
unbind = (i > 0);\r
\r
/* allow combos if device supports them */\r
- if (i == 1 && in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))\r
+ if (i == 1 && bindtype == IN_BINDTYPE_EMU &&\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, unbind);\r
- if (player_idx >= 0) {\r
- /* FIXME */\r
- in_bind_key(dev_id, kc, 3 << 16, 1);\r
- in_bind_key(dev_id, kc, player_idx << 16, 0);\r
- }\r
+ in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind);\r
}\r
}\r
\r
{ "Z ", 0x0100 }\r
};\r
\r
-// player2_flag, reserved, ?, ?,\r
-// ?, ?, fast forward, menu\r
-// "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",\r
-// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
me_bind_action emuctrl_actions[] =\r
{\r
- { "Load State ", 1 << PEVB_STATE_LOAD },\r
- { "Save State ", 1 << PEVB_STATE_SAVE },\r
- { "Prev Save Slot ", 1 << PEVB_SSLOT_PREV },\r
- { "Next Save Slot ", 1 << PEVB_SSLOT_NEXT },\r
- { "Switch Renderer ", 1 << PEVB_SWITCH_RND },\r
- { "Volume Down ", 1 << PEVB_VOL_DOWN },\r
- { "Volume Up ", 1 << PEVB_VOL_UP },\r
- { "Fast forward ", 1 << PEVB_FF },\r
- { "Enter Menu ", 1 << PEVB_MENU },\r
- { "Pico Next page ", 1 << 21 }, /* TODO */\r
- { "Pico Prev page ", 1 << 20 },\r
- { "Pico Switch input", 1 << 19 },\r
+ { "Load State ", PEV_STATE_LOAD },\r
+ { "Save State ", PEV_STATE_SAVE },\r
+ { "Prev Save Slot ", PEV_SSLOT_PREV },\r
+ { "Next Save Slot ", PEV_SSLOT_NEXT },\r
+ { "Switch Renderer ", PEV_SWITCH_RND },\r
+ { "Volume Down ", PEV_VOL_DOWN },\r
+ { "Volume Up ", PEV_VOL_UP },\r
+ { "Fast forward ", PEV_FF },\r
+ { "Enter Menu ", PEV_MENU },\r
+ { "Pico Next page ", PEV_PICO_PNEXT },\r
+ { "Pico Prev page ", PEV_PICO_PPREV },\r
+ { "Pico Switch input", PEV_PICO_SWINP },\r
{ NULL, 0 }\r
};\r
\r
static int menu_loop_keyconfig(menu_id id, int keys)\r
{\r
static int sel = 0;\r
+\r
+ me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, rom_loaded);\r
me_loop(e_menu_keyconfig, &sel);\r
return 0;\r
}\r
\r
static menu_entry e_menu_adv_options[] =\r
{\r
- mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_USE_SRAM),\r
+ mee_onoff ("SRAM/BRAM saves", MA_OPT_SRAM_STATES, currentConfig.EmuOpt, EOPT_EN_SRAM),\r
mee_onoff ("Disable sprite limit", MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM),\r
mee_onoff ("Use second CPU for sound", MA_OPT_ARM940_SOUND, PicoOpt, POPT_EXT_FM),\r
mee_onoff ("Emulate Z80", MA_OPT2_ENABLE_Z80, PicoOpt, POPT_EN_Z80),\r
\r
// ------------ gfx options menu ------------\r
\r
+static int mh_opt_render(menu_id id, int keys)\r
+{\r
+ plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 1);\r
+ return 0;\r
+}\r
+\r
+static const char *mgn_opt_renderer(menu_id id, int *offs)\r
+{\r
+ *offs = -11;\r
+ if (PicoOpt & POPT_ALT_RENDERER)\r
+ return " 8bit fast";\r
+ else if (currentConfig.EmuOpt & EOPT_16BPP)\r
+ return "16bit accurate";\r
+ else\r
+ return " 8bit accurate";\r
+}\r
+\r
static const char *mgn_opt_scaling(menu_id id, int *offs)\r
{\r
*offs = -13;\r
\r
static menu_entry e_menu_gfx_options[] =\r
{\r
+ mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer),\r
mee_range_cust("Scaling", MA_OPT_SCALING, currentConfig.scaling, 0, 3, mgn_opt_scaling),\r
+ mee_onoff ("Tearing Fix", MA_OPT_TEARING_FIX, currentConfig.EmuOpt, EOPT_WIZ_TEAR_FIX),\r
mee_range_cust("Gamma correction", MA_OPT2_GAMMA, currentConfig.gamma, 1, 300, mgn_aopt_gamma),\r
mee_onoff ("A_SN's gamma curve", MA_OPT2_A_SN_GAMMA, currentConfig.EmuOpt, EOPT_A_SN_GAMMA),\r
mee_onoff ("Perfect vsync", MA_OPT2_VSYNC, currentConfig.EmuOpt, EOPT_PSYNC),\r
\r
static menu_entry e_menu_options[];\r
\r
-/* TODO: move to plat */\r
-static int mh_opt_render(menu_id id, int keys)\r
-{\r
- if (keys & PBTN_LEFT) {\r
- if (PicoOpt&0x10) PicoOpt&= ~0x10;\r
- else if (!(currentConfig.EmuOpt &0x80))currentConfig.EmuOpt |= 0x80;\r
- } else {\r
- if (PicoOpt&0x10) return 0;\r
- else if (!(currentConfig.EmuOpt &0x80))PicoOpt|= 0x10;\r
- else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
- }\r
- return 0;\r
-}\r
-\r
static int sndrate_prevnext(int rate, int dir)\r
{\r
static const int rates[] = { 8000, 11025, 16000, 22050, 44100 };\r
switch (id) {\r
case MA_OPT_SAVECFG:\r
case MA_OPT_SAVECFG_GAME:\r
- if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0))\r
+ if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))\r
me_update_msg("config saved");\r
else\r
me_update_msg("failed to write config");\r
break;\r
case MA_OPT_LOADCFG:\r
- ret = emu_ReadConfig(1, 1);\r
- if (!ret) ret = emu_ReadConfig(0, 1);\r
+ ret = emu_read_config(1, 1);\r
+ if (!ret) ret = emu_read_config(0, 1);\r
if (ret) me_update_msg("config loaded");\r
else me_update_msg("failed to load config");\r
break;\r
return 1;\r
}\r
\r
-static const char *mgn_opt_renderer(menu_id id, int *offs)\r
+static int mh_restore_defaults(menu_id id, int keys)\r
{\r
- *offs = -6;\r
- if (PicoOpt & POPT_ALT_RENDERER)\r
- return " 8bit fast";\r
- else if (currentConfig.EmuOpt & 0x80)\r
- return "16bit accurate";\r
- else\r
- return " 8bit accurate";\r
+ emu_set_defconfig();\r
+ me_update_msg("defaults restored");\r
+ return 1;\r
}\r
\r
static const char *mgn_opt_fskip(menu_id id, int *offs)\r
mee_range ("Save slot", MA_OPT_SAVE_SLOT, state_slot, 0, 9),\r
mee_range_cust("Frameskip", MA_OPT_FRAMESKIP, currentConfig.Frameskip, -1, 16, mgn_opt_fskip),\r
mee_cust ("Region", MA_OPT_REGION, mh_opt_misc, mgn_opt_region),\r
- mee_cust ("Renderer", MA_OPT_RENDERER, mh_opt_render, mgn_opt_renderer),\r
- mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, 0x002),\r
- mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, 0x004),\r
+ mee_onoff ("Show FPS", MA_OPT_SHOW_FPS, currentConfig.EmuOpt, EOPT_SHOW_FPS),\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_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),\r
mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),\r
mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),\r
mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg),\r
+ mee_handler ("Restore defaults", mh_restore_defaults),\r
mee_end,\r
};\r
\r
\r
static void mplayer_loop(void)\r
{\r
- emu_startSound();\r
+ pemu_sound_start();\r
\r
while (1)\r
{\r
PDebugZ80Frame();\r
if (in_menu_wait_any(0) & PBTN_MA3)\r
break;\r
- emu_waitSound();\r
+ pemu_sound_wait();\r
}\r
\r
- emu_endSound();\r
+ pemu_sound_stop();\r
}\r
\r
static void draw_text_debug(const char *str, int skip, int from)\r
if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);\r
\r
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- emu_forcedFrame(0);\r
+ pemu_forced_frame(0);\r
smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);\r
smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
}\r
{\r
case 0: plat_video_menu_begin();\r
tmp = PDebugMain();\r
- emu_platformDebugCat(tmp);\r
+ plat_debug_cat(tmp);\r
draw_text_debug(tmp, 0, 0);\r
if (dumped) {\r
smalltext_out16(g_screen_width - 6 * me_sfont_h,\r
break;\r
case 1: draw_frame_debug(); break;\r
case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
- emu_forcedFrame(0);\r
+ pemu_forced_frame(0);\r
menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +\r
g_screen_width/2 - 320/2, g_screen_width); break;\r
break;\r
case MA_MAIN_RESET_GAME:\r
if (rom_loaded) {\r
- emu_ResetGame();\r
+ emu_reset_game();\r
return 1;\r
}\r
break;\r
if (ret_name == NULL)\r
return 0;\r
\r
- cd_type = emu_cdCheck(NULL, ret_name);\r
+ cd_type = emu_cd_check(NULL, ret_name);\r
if (cd_type != CIT_NOT_CD)\r
ret = Insert_CD(ret_name, cd_type);\r
if (ret != 0) {\r
notaz.gp2x.de / libpicofe.git / blobdiff