X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fgp2x%2Finput.c;h=c2f88f6c0e534ef313cfb9da14bbc0b016140050;hb=0bb3fe122854be9af6c3024fef9f503d27bc63a1;hp=43da4b3b0af3e982ed862c8ca304cf18beb342ee;hpb=03497cf8eeda7f6d0ad91286819ed613e8d8f648;p=fceu.git diff --git a/drivers/gp2x/input.c b/drivers/gp2x/input.c index 43da4b3..c2f88f6 100644 --- a/drivers/gp2x/input.c +++ b/drivers/gp2x/input.c @@ -22,6 +22,8 @@ #include "../../video.h" #include "usbjoy.h" +extern int FSkip; + /* UsrInputType[] is user-specified. InputType[] is current (game loading can override user settings) */ @@ -86,7 +88,7 @@ static void do_emu_acts(uint32 acts) FCEUD_Update(XBuf+8,NULL,0); while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) ) usleep(50*1024); if (keys & GP2X_X) do_it = 0; - FCEU_DispMessage(""); + FCEU_CancelDispMessage(); } if (do_it) FCEUI_LoadState(); } @@ -105,7 +107,7 @@ static void do_emu_acts(uint32 acts) FCEUD_Update(XBuf+8,NULL,0); while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) ) usleep(50*1024); if (keys & GP2X_X) do_it = 0; - FCEU_DispMessage(""); + FCEU_CancelDispMessage(); } } if (do_it) FCEUI_SaveState(); @@ -184,7 +186,7 @@ static void do_fake_mouse(unsigned long keys) } -void FCEUD_UpdateInput(void) +static void FCEUD_UpdateInput(void) { static int volpushed_frames = 0; static int turbo_rate_cnt_a[2] = {0,0}, turbo_rate_cnt_b[2] = {0,0}; @@ -195,6 +197,7 @@ void FCEUD_UpdateInput(void) if ((down(VOL_DOWN) && down(VOL_UP)) || (keys & (GP2X_L|GP2X_L|GP2X_START)) == (GP2X_L|GP2X_L|GP2X_START)) { Exit = 1; + FSkip = 0; /* force rendering the last frame for menu */ return; } else if (down(VOL_UP))