devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix small issues in xobox (part of FS#10283 by Teruaki Kawashima)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21522 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Johannes Schwarz 2009-06-26 17:14:48 +00:00
parent 057a5802cd
commit c2565c9bcf
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/plugins/xobox.c
View file

@ -307,9 +307,6 @@ PLUGIN_HEADER
#define PIC_QIX 0 #define PIC_QIX 0
#define PIC_PLAYER 1 #define PIC_PLAYER 1
#define MENU_START 0
#define MENU_QUIT 1
/* The time (in ms) for one iteration through the game loop - decrease this /* The time (in ms) for one iteration through the game loop - decrease this
to speed up the game - note that current_tick is (currently) only accurate to speed up the game - note that current_tick is (currently) only accurate
to 10ms. to 10ms.
@ -932,7 +929,7 @@ static int xobox_menu(bool ingame)
"Resume Game", "Resume Game",
"Restart Level", "Restart Level",
"Speed", "Speed",
"Difficult", "Difficulty",
"Playback Control", "Playback Control",
"Quit"); "Quit");
@ -1005,7 +1002,7 @@ static int xobox_loop (void)
bool pause = false; bool pause = false;
int end; int end;
if (xobox_menu(false)==1) { if (xobox_menu(false)) {
return PLUGIN_OK; return PLUGIN_OK;
} }
@ -1015,7 +1012,7 @@ static int xobox_loop (void)
#ifdef HAS_BUTTON_HOLD #ifdef HAS_BUTTON_HOLD
if (rb->button_hold()) { if (rb->button_hold()) {
pause = true; pause = true;
rb->splash (HZ, "PAUSED"); rb->splash (HZ, "Paused");
} }
#endif #endif
@ -1043,9 +1040,11 @@ static int xobox_loop (void)
rb->splash (HZ, "Paused"); rb->splash (HZ, "Paused");
break; break;
case QUIT: case QUIT:
if (xobox_menu(true)==1) { if (!pause) {
if (xobox_menu(true)) {
quit = true; quit = true;
} }
}
break; break;
default: default:
if (rb->default_event_handler (button) == SYS_USB_CONNECTED) if (rb->default_event_handler (button) == SYS_USB_CONNECTED)
@ -1058,7 +1057,7 @@ static int xobox_loop (void)
} }
if (player.gameover) { if (player.gameover) {
rb->splash (HZ, "Game Over!"); rb->splash (HZ, "Game Over!");
if (xobox_menu(false)==1) { if (xobox_menu(false)) {
quit = true; quit = true;
} }
} }