summaryrefslogtreecommitdiffstats
path: root/apps/plugins/chopper.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/chopper.c')
-rw-r--r--apps/plugins/chopper.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 1c3d7a765c..89f6e3db13 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -624,22 +624,17 @@ static void chopDrawScene(void)
static int chopMenu(int menunum)
{
- int m;
int result;
int res = 0;
bool menu_quit = false;
- static const struct menu_item items[] = {
- { "Start New Game", NULL },
- { "Resume Game", NULL },
- { "Level", NULL },
- { "Quit", NULL },
- };
-
static const struct opt_items levels[2] = {
{ "Normal", -1 },
{ "Steep", -1 },
};
+
+ MENUITEM_STRINGLIST(menu,"Chopper Menu",NULL,"Start New Game","Resume Game",
+ "Level","Quit");
#ifdef HAVE_LCD_COLOR
rb->lcd_set_foreground(LCD_WHITE);
@@ -651,11 +646,8 @@ static int chopMenu(int menunum)
rb->lcd_clear_display();
- m = rb->menu_init(items, sizeof(items) / sizeof(*items),
- NULL, NULL, NULL, NULL);
-
while (!menu_quit) {
- result=rb->menu_show(m);
+ result=rb->do_menu(&menu,&result);
switch (result)
{
case 0: /* Start New Game */
@@ -685,7 +677,6 @@ static int chopMenu(int menunum)
}
}
rb->lcd_clear_display();
- rb->menu_exit(m);
return res;
}