summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorFranklin Wei <franklin@rockbox.org>2020-06-27 19:13:19 -0400
committerFranklin Wei <franklin@rockbox.org>2020-06-27 19:13:19 -0400
commit4b108896cc7440986d9e2384021db7ea9c42abb7 (patch)
tree78495babfbbf74fad096469e75625a360b3a2c0f /apps
parent5831801d168c48fcdd97de8cb29442534afbfad0 (diff)
downloadrockbox-4b108896cc7440986d9e2384021db7ea9c42abb7.tar.gz
rockbox-4b108896cc7440986d9e2384021db7ea9c42abb7.tar.bz2
rockbox-4b108896cc7440986d9e2384021db7ea9c42abb7.zip
puzzles: replace menu title kludge with more elegant solution
This hack has survived for far too long. Change-Id: Idca0b647bd6e77f2afcd9a538513a6b9aa970fc7
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/puzzles/rockbox.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 300e2c33c7..de89c42eed 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -167,6 +167,9 @@ static struct {
bool timerflash, clipoff, shortcuts, no_aa, polyanim;
} debug_settings;
+// used in menu titles - make sure to initialize!
+static char menu_desc[32];
+
/* These are re-implementations of many rockbox drawing functions, adapted to
* draw into a custom framebuffer (used for the zoom feature). */
static void zoom_drawpixel(int x, int y)
@@ -2717,9 +2720,7 @@ static void new_game_notify(void)
static int pause_menu(void)
{
-#define static auto
-#define const
- MENUITEM_STRINGLIST(menu, NULL, pausemenu_cb,
+ MENUITEM_STRINGLIST(menu, menu_desc, pausemenu_cb,
"Resume Game", // 0
"New Game", // 1
"Restart Game", // 2
@@ -2735,12 +2736,6 @@ static int pause_menu(void)
"Configure Game", // 12
"Quit without Saving", // 13
"Quit"); // 14
-#undef static
-#undef const
- /* HACK ALERT */
- char title[32] = { 0 };
- rb->snprintf(title, sizeof(title), "%s Menu", midend_which_game(me)->name);
- menu__.desc = title;
#if defined(FOR_REAL) && defined(DEBUG_MENU)
help_times = 0;
@@ -3289,6 +3284,9 @@ static void puzzles_main(void)
init_for_game(&thegame, -1);
}
+ /* must be done before any menu needs to be displayed */
+ rb->snprintf(menu_desc, sizeof(menu_desc), "%s Menu", midend_which_game(me)->name);
+
#ifdef HAVE_ADJUSTABLE_CPU_FREQ
/* about to go to menu or button block */
rb->cpu_boost(false);
@@ -3298,9 +3296,7 @@ static void puzzles_main(void)
help_times = 0;
#endif
-#define static auto
-#define const
- MENUITEM_STRINGLIST(menu, NULL, mainmenu_cb,
+ MENUITEM_STRINGLIST(menu, menu_desc, mainmenu_cb,
"Resume Game", // 0
"New Game", // 1
"Quick Help", // 2
@@ -3310,13 +3306,6 @@ static void puzzles_main(void)
"Configure Game", // 6
"Quit without Saving", // 7
"Quit"); // 8
-#undef static
-#undef const
-
- /* HACK ALERT */
- char title[32] = { 0 };
- rb->snprintf(title, sizeof(title), "%s Menu", midend_which_game(me)->name);
- menu__.desc = title;
bool quit = false;
int sel = 0;