summaryrefslogtreecommitdiffstats
path: root/apps/plugins/xobox.c
diff options
context:
space:
mode:
authorJohannes Schwarz <ubuntuxer@rockbox.org>2009-06-26 17:14:48 +0000
committerJohannes Schwarz <ubuntuxer@rockbox.org>2009-06-26 17:14:48 +0000
commitc2565c9bcf02b8b9fe0311a15a731dde449c1552 (patch)
tree5864b81c4bb297d38a17984247337fa1ba67bfd9 /apps/plugins/xobox.c
parent057a5802cd93be6f456e4a0ccdef948d79f3dd06 (diff)
downloadrockbox-c2565c9bcf02b8b9fe0311a15a731dde449c1552.tar.gz
rockbox-c2565c9bcf02b8b9fe0311a15a731dde449c1552.zip
fix small issues in xobox (part of FS#10283 by Teruaki Kawashima)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21522 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/xobox.c')
-rw-r--r--apps/plugins/xobox.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 26f9bc2f4d..82e1511f70 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -307,9 +307,6 @@ PLUGIN_HEADER
#define PIC_QIX 0
#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
to speed up the game - note that current_tick is (currently) only accurate
to 10ms.
@@ -932,7 +929,7 @@ static int xobox_menu(bool ingame)
"Resume Game",
"Restart Level",
"Speed",
- "Difficult",
+ "Difficulty",
"Playback Control",
"Quit");
@@ -1005,7 +1002,7 @@ static int xobox_loop (void)
bool pause = false;
int end;
- if (xobox_menu(false)==1) {
+ if (xobox_menu(false)) {
return PLUGIN_OK;
}
@@ -1014,8 +1011,8 @@ static int xobox_loop (void)
#ifdef HAS_BUTTON_HOLD
if (rb->button_hold()) {
- pause = true;
- rb->splash (HZ, "PAUSED");
+ pause = true;
+ rb->splash (HZ, "Paused");
}
#endif
@@ -1043,8 +1040,10 @@ static int xobox_loop (void)
rb->splash (HZ, "Paused");
break;
case QUIT:
- if (xobox_menu(true)==1) {
- quit = true;
+ if (!pause) {
+ if (xobox_menu(true)) {
+ quit = true;
+ }
}
break;
default:
@@ -1058,7 +1057,7 @@ static int xobox_loop (void)
}
if (player.gameover) {
rb->splash (HZ, "Game Over!");
- if (xobox_menu(false)==1) {
+ if (xobox_menu(false)) {
quit = true;
}
}