X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=87b878889a24093aa6421696ce28bb44d509c23e;hp=e7d20ffef064d0fcffc00b03017c399c91e5061f;hb=dc990066a301c231e5982a346f4809b4e0247a51;hpb=43bca6fbee5f6b26ee02e8850bf7dace8d63336b diff --git a/frontend/menu.c b/frontend/menu.c index e7d20ffe..87b87888 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -20,9 +20,13 @@ #include "plugin.h" #include "plugin_lib.h" #include "omap.h" +#include "pcnt.h" #include "common/plat.h" #include "../libpcsxcore/misc.h" +#include "../libpcsxcore/cdrom.h" #include "../libpcsxcore/psemu_plugin_defs.h" +#include "../libpcsxcore/new_dynarec/new_dynarec.h" +#include "../plugins/dfinput/pad.h" #include "revision.h" #define MENU_X2 1 @@ -36,6 +40,7 @@ typedef enum MA_MAIN_LOAD_STATE, MA_MAIN_RESET_GAME, MA_MAIN_LOAD_ROM, + MA_MAIN_SWAP_CD, MA_MAIN_RUN_BIOS, MA_MAIN_CONTROLS, MA_MAIN_CREDITS, @@ -60,10 +65,10 @@ enum { }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, state_slot, cpu_clock, cpu_clock_st; +static int scaling, filter, cpu_clock, cpu_clock_st; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; -static int region, in_type_sel; +static int warned_about_bios, region, in_type_sel; int g_opts; // from softgpu plugin @@ -103,28 +108,16 @@ void emu_make_path(char *buff, const char *end, int size) static int emu_check_save_file(int slot) { - char fname[MAXPATHLEN]; - int ret; - - ret = get_state_filename(fname, sizeof(fname), slot); - if (ret != 0) - return 0; - - ret = CheckState(fname); + int ret = emu_check_state(slot); return ret == 0 ? 1 : 0; } -static int emu_save_load_game(int load, int sram) +static int emu_save_load_game(int load, int unused) { - char fname[MAXPATHLEN]; int ret; - ret = get_state_filename(fname, sizeof(fname), state_slot); - if (ret != 0) - return 0; - if (load) { - ret = LoadState(fname); + ret = emu_load_state(state_slot); // reflect hle/bios mode from savestate if (Config.HLE) @@ -134,7 +127,7 @@ static int emu_save_load_game(int load, int sram) bios_sel = 1; } else - ret = SaveState(fname); + ret = emu_save_state(state_slot); return ret; } @@ -171,7 +164,8 @@ static void menu_set_defconfig(void) iUseReverb = 2; iUseInterpolation = 1; - iXAPitch = iSPUIRQWait = 0; + iXAPitch = 0; + iSPUIRQWait = 1; iUseTimer = 2; menu_sync_config(); @@ -189,6 +183,10 @@ static void menu_set_defconfig(void) #define CE_INTVAL(val) \ { #val, sizeof(val), &val } +// 'versioned' var, used when defaults change +#define CE_INTVAL_V(val, ver) \ + { #val #ver, sizeof(val), &val } + static const struct { const char *name; size_t len; @@ -223,10 +221,11 @@ static const struct { CE_INTVAL(UseFrameSkip), CE_INTVAL(dwActFixes), CE_INTVAL(iUseReverb), - CE_INTVAL(iUseInterpolation), CE_INTVAL(iXAPitch), - CE_INTVAL(iSPUIRQWait), + CE_INTVAL_V(iUseInterpolation, 2), + CE_INTVAL_V(iSPUIRQWait, 2), CE_INTVAL(iUseTimer), + CE_INTVAL(warned_about_bios), }; static char *get_cd_label(void) @@ -419,7 +418,7 @@ fail: static unsigned short fname2color(const char *fname) { static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" }; - static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" }; + static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index", ".sbi" }; const char *ext = strrchr(fname, '.'); int i; @@ -663,13 +662,12 @@ me_bind_action me_ctrl_actions[] = me_bind_action emuctrl_actions[] = { -/* - { "Load State ", PEV_STATE_LOAD }, - { "Save State ", PEV_STATE_SAVE }, - { "Prev Save Slot ", PEV_SSLOT_PREV }, - { "Next Save Slot ", PEV_SSLOT_NEXT }, -*/ - { "Enter Menu ", PEV_MENU }, + { "Save State ", 1 << SACTION_SAVE_STATE }, + { "Load State ", 1 << SACTION_LOAD_STATE }, + { "Prev Save Slot ", 1 << SACTION_PREV_SSLOT }, + { "Next Save Slot ", 1 << SACTION_NEXT_SSLOT }, + { "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP }, + { "Enter Menu ", 1 << SACTION_ENTER_MENU }, { NULL, 0 } }; @@ -835,7 +833,7 @@ static void keys_load_all(const char *cfg) bind = parse_bind_val(act, &bindtype); if (bind != -1 && bind != 0) { - printf("bind #%d '%s' %08x (%s)\n", dev_id, key, bind, act); + //printf("bind #%d '%s' %08x (%s)\n", dev_id, key, bind, act); in_config_bind_key(dev_id, key, bind, bindtype); } else @@ -1039,7 +1037,7 @@ static int menu_loop_plugin_gpu(int id, int keys) static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL }; static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL }; -static const char h_spu_irq_wait[] = "Wait for CPU; only useful for some games, may cause glitches"; +static const char h_spu_irq_wait[] = "Wait for CPU (recommended set to ON)"; static const char h_spu_thread[] = "Run sound emulation in main thread (recommended)"; static menu_entry e_menu_plugin_spu[] = @@ -1059,9 +1057,9 @@ static int menu_loop_plugin_spu(int id, int keys) return 0; } -static const char h_bios[] = "HLE is simulated BIOS. BIOS is saved in savestates.\n" - "Must save config and reload the game\n" - "for change to take effect"; +static const char h_bios[] = "HLE is simulated BIOS. BIOS selection is saved in savestates\n" + "and can't be changed there. Must save config and reload\n" + "the game for change to take effect"; static const char h_plugin_xpu[] = "Must save config and reload the game\n" "for plugin change to take effect"; static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17"; @@ -1095,7 +1093,7 @@ static int menu_loop_plugin_options(int id, int keys) // ------------ adv options menu ------------ -static const char h_cfg_cpul[] = "Shows CPU usage in %%"; +static const char h_cfg_cpul[] = "Shows CPU usage in %"; static const char h_cfg_fl[] = "Frame Limiter keeps the game from running too fast"; static const char h_cfg_xa[] = "Disables XA sound, which can sometimes improve performance"; static const char h_cfg_cdda[] = "Disable CD Audio for a performance boost\n" @@ -1203,14 +1201,43 @@ static void debug_menu_loop(void) // ------------ main menu ------------ +static void menu_bios_warn(void) +{ + int inp; + static const char msg[] = + "You don't seem to have copied any BIOS files to\n" + "/pandora/appdata/pcsx_rearmed/bios/\n\n" + "While many games work fine with fake (HLE) BIOS,\n" + "others (like MGS and FF8) require BIOS to work.\n" + "After copying the file, you'll also need to\n" + "select it in the emu's options->[BIOS/Plugins]\n\n" + "The file is usually named SCPH1001.BIN, but\n" + "other not compressed files can be used too.\n\n" + "Press (B) or (X) to continue"; + + while (1) + { + menu_draw_begin(1); + draw_menu_message(msg, NULL); + menu_draw_end(); + + inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); + if (inp & (PBTN_MBACK|PBTN_MOK)) + return; + } +} + +// ------------ main menu ------------ + void OnFile_Exit(); static void draw_frame_main(void) { if (CdromId[0] != 0) { char buff[64]; - snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)", - get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC"); + snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)", + get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC", + Config.HLE ? "HLE" : "BIOS"); smalltext_out16(4, 1, buff, 0x105f); } } @@ -1220,20 +1247,18 @@ static void draw_frame_credits(void) smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc); } -const char *plat_get_credits(void) -{ - return "PCSX-ReARMed\n\n" - "(C) 1999-2003 PCSX Team\n" - "(C) 2005-2009 PCSX-df Team\n" - "(C) 2009-2011 PCSX-Reloaded Team\n\n" - "GPU and SPU code by Pete Bernert\n" - " and the P.E.Op.S. team\n" - "ARM recompiler (C) 2009-2011 Ari64\n" - "PCSX4ALL plugins by PCSX4ALL team\n" - " Chui, Franxis, Unai\n\n" - "integration, optimization and\n" - " frontend (C) 2010-2011 notaz\n"; -} +static const char credits_text[] = + "PCSX-ReARMed\n\n" + "(C) 1999-2003 PCSX Team\n" + "(C) 2005-2009 PCSX-df Team\n" + "(C) 2009-2011 PCSX-Reloaded Team\n\n" + "GPU and SPU code by Pete Bernert\n" + " and the P.E.Op.S. team\n" + "ARM recompiler (C) 2009-2011 Ari64\n" + "PCSX4ALL plugins by PCSX4ALL team\n" + " Chui, Franxis, Unai\n\n" + "integration, optimization and\n" + " frontend (C) 2010-2011 notaz\n"; static int reset_game(void) { @@ -1261,6 +1286,7 @@ static int run_bios(void) ClosePlugins(); set_cd_image(NULL); LoadPlugins(); + pcnt_hook_plugins(); NetOpened = 0; if (OpenPlugins() == -1) { me_update_msg("failed to open plugins"); @@ -1285,6 +1311,7 @@ static int run_cd_image(const char *fname) ClosePlugins(); set_cd_image(fname); LoadPlugins(); + pcnt_hook_plugins(); NetOpened = 0; if (OpenPlugins() == -1) { me_update_msg("failed to open plugins"); @@ -1323,6 +1350,8 @@ static int romsel_run(void) printf("selected file: %s\n", fname); + new_dynarec_clear_full(); + if (run_cd_image(fname) != 0) return -1; @@ -1343,6 +1372,36 @@ static int romsel_run(void) return 0; } +static int swap_cd_image(void) +{ + char *fname; + + fname = menu_loop_romsel(last_selected_fname, sizeof(last_selected_fname)); + if (fname == NULL) + return -1; + + printf("selected file: %s\n", fname); + + CdromId[0] = '\0'; + CdromLabel[0] = '\0'; + + set_cd_image(fname); + if (ReloadCdromPlugin() < 0) { + me_update_msg("failed to load cdr plugin"); + return -1; + } + if (CDR_open() < 0) { + me_update_msg("failed to open cdr plugin"); + return -1; + } + + SetCdOpenCaseTime(time(NULL) + 2); + LidInterrupt(); + + strcpy(last_selected_fname, rom_fname_reload); + return 0; +} + static int main_menu_handler(int id, int keys) { switch (id) @@ -1367,12 +1426,16 @@ static int main_menu_handler(int id, int keys) if (romsel_run() == 0) return 1; break; + case MA_MAIN_SWAP_CD: + if (swap_cd_image() == 0) + return 1; + break; case MA_MAIN_RUN_BIOS: if (run_bios() == 0) return 1; break; case MA_MAIN_CREDITS: - draw_menu_credits(draw_frame_credits); + draw_menu_message(credits_text, draw_frame_credits); in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); break; case MA_MAIN_EXIT: @@ -1395,6 +1458,7 @@ static menu_entry e_menu_main[] = mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler), mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler), mee_handler_id("Load CD image", MA_MAIN_LOAD_ROM, main_menu_handler), + mee_handler_id("Change CD image", MA_MAIN_SWAP_CD, main_menu_handler), mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler), mee_handler ("Options", menu_loop_options), mee_handler ("Controls", menu_loop_keyconfig), @@ -1413,10 +1477,16 @@ void menu_loop(void) menu_leave_emu(); + if (bioses[1] == NULL && !warned_about_bios) { + menu_bios_warn(); + warned_about_bios = 1; + } + me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go); me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go && CdromId[0]); me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go && CdromId[0]); me_enable(e_menu_main, MA_MAIN_RESET_GAME, ready_to_go); + me_enable(e_menu_main, MA_MAIN_SWAP_CD, ready_to_go); me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0); in_set_config_int(0, IN_CFG_BLOCKING, 1); @@ -1640,6 +1710,8 @@ void menu_prepare_emu(void) if (ret) fprintf(stderr, "Warning: GPU_open returned %d\n", ret); } + + dfinput_activate(in_type == PSE_PAD_TYPE_ANALOGPAD); } void me_update_msg(const char *msg)