X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmain.c;h=902acb75145db1886f9373348d1fb2676626f984;hb=584fc319758b6873051f4c96af42635c02f5f2e2;hp=ecfffeb4173d33124a78037950af385984af7a6e;hpb=384af87540d751ef274e5956d58f4bbc153a34a9;p=pcsx_rearmed.git diff --git a/frontend/main.c b/frontend/main.c index ecfffeb4..902acb75 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -23,6 +23,7 @@ #include "plat.h" #include "../libpcsxcore/misc.h" #include "../libpcsxcore/cheat.h" +#include "../libpcsxcore/sio.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "../plugins/cdrcimg/cdrcimg.h" #include "../plugins/dfsound/spu_config.h" @@ -492,7 +493,7 @@ int emu_core_init(void) void emu_core_ask_exit(void) { - stop = 1; + stop++; g_emu_want_quit = 1; } @@ -708,8 +709,8 @@ static void toggle_fast_forward(int force_off) { static int fast_forward; static int normal_g_opts; - static int normal_frameskip; static int normal_enhancement_enable; + //static int normal_frameskip; if (force_off && !fast_forward) return; @@ -717,16 +718,16 @@ static void toggle_fast_forward(int force_off) fast_forward = !fast_forward; if (fast_forward) { normal_g_opts = g_opts; - normal_frameskip = pl_rearmed_cbs.frameskip; + //normal_frameskip = pl_rearmed_cbs.frameskip; normal_enhancement_enable = pl_rearmed_cbs.gpu_neon.enhancement_enable; g_opts |= OPT_NO_FRAMELIM; - pl_rearmed_cbs.frameskip = 3; + // pl_rearmed_cbs.frameskip = 3; // too broken pl_rearmed_cbs.gpu_neon.enhancement_enable = 0; } else { g_opts = normal_g_opts; - pl_rearmed_cbs.frameskip = normal_frameskip; + //pl_rearmed_cbs.frameskip = normal_frameskip; pl_rearmed_cbs.gpu_neon.enhancement_enable = normal_enhancement_enable; @@ -741,7 +742,7 @@ static void toggle_fast_forward(int force_off) static void SignalExit(int sig) { // only to restore framebuffer/resolution on some devices plat_finish(); - exit(1); + _exit(1); } #endif @@ -785,9 +786,6 @@ void SysClose() { } } -void SysUpdate() { -} - int get_state_filename(char *buf, int size, int i) { return get_gameid_filename(buf, size, "." STATES_DIR "%.32s-%.9s.%3.3d", i); @@ -894,8 +892,6 @@ static int _OpenPlugins(void) { signal(SIGPIPE, SignalExit); #endif - GPU_clearDynarec(clearDynarec); - ret = CDR_open(); if (ret < 0) { SysMessage(_("Error opening CD-ROM plugin!")); return -1; } ret = SPU_open();