mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-14 02:27:39 -04:00
some changes to use of display_text.
* add parameter, wait_key to display_text(). - set this true to wait button press after all words is displayed. * use ARRAYLEN macro instead of #define WORDS * add macro to indicate end of style array. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24846 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
04067fd7a0
commit
56d29e8977
13 changed files with 91 additions and 166 deletions
|
@ -970,8 +970,6 @@ static void pegbox_move_player(struct game_context* pb, signed int x_dir,
|
|||
************************************************************************/
|
||||
static bool pegbox_help(void)
|
||||
{
|
||||
int button;
|
||||
#define WORDS (sizeof help_text / sizeof (char*))
|
||||
static char* help_text[] = {
|
||||
"Pegbox", "", "Aim", "",
|
||||
"To", "beat", "each", "level,", "you", "must", "destroy", "all", "of",
|
||||
|
@ -990,20 +988,14 @@ static bool pegbox_help(void)
|
|||
{ 0, TEXT_CENTER|TEXT_UNDERLINE },
|
||||
{ 2, C_RED },
|
||||
{ 46, C_RED },
|
||||
{ -1, 0 }
|
||||
LAST_STYLE_ITEM
|
||||
};
|
||||
|
||||
rb->lcd_setfont(FONT_UI);
|
||||
|
||||
if (display_text(WORDS, help_text, formation, NULL))
|
||||
if (display_text(ARRAYLEN(help_text), help_text, formation, NULL, true))
|
||||
return true;
|
||||
do {
|
||||
button = rb->button_get(true);
|
||||
if ( rb->default_event_handler( button ) == SYS_USB_CONNECTED )
|
||||
return true;
|
||||
} while( ( button == BUTTON_NONE )
|
||||
|| ( button & (BUTTON_REL|BUTTON_REPEAT) ) );
|
||||
rb->lcd_setfont(FONT_SYSFIXED);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue