Fix wrong text colour in help, adapt pegbox manual to r21867
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22016 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
06d51630c1
commit
0d9b7ec73e
5 changed files with 17 additions and 10 deletions
|
@ -779,11 +779,16 @@ static int brickmania_help(void)
|
||||||
{ 67, C_GREEN },
|
{ 67, C_GREEN },
|
||||||
{ 74, C_YELLOW },
|
{ 74, C_YELLOW },
|
||||||
{ 80, C_RED },
|
{ 80, C_RED },
|
||||||
|
{ -1, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef HAVE_LCD_COLOR
|
||||||
|
rb->lcd_set_background(LCD_BLACK);
|
||||||
|
rb->lcd_set_foreground(LCD_WHITE);
|
||||||
|
#endif
|
||||||
|
int button;
|
||||||
if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
|
if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
|
||||||
return PLUGIN_USB_CONNECTED;
|
return PLUGIN_USB_CONNECTED;
|
||||||
int button;
|
|
||||||
do {
|
do {
|
||||||
button = rb->button_get(true);
|
button = rb->button_get(true);
|
||||||
if (button == SYS_USB_CONNECTED) {
|
if (button == SYS_USB_CONNECTED) {
|
||||||
|
|
|
@ -1275,12 +1275,11 @@ static bool jewels_help(void)
|
||||||
{ 42, C_RED },
|
{ 42, C_RED },
|
||||||
{ -1, 0 }
|
{ -1, 0 }
|
||||||
};
|
};
|
||||||
int button;
|
|
||||||
|
|
||||||
#ifdef HAVE_LCD_COLOR
|
#ifdef HAVE_LCD_COLOR
|
||||||
rb->lcd_set_background(LCD_BLACK);
|
rb->lcd_set_background(LCD_BLACK);
|
||||||
rb->lcd_set_foreground(LCD_WHITE);
|
rb->lcd_set_foreground(LCD_WHITE);
|
||||||
#endif
|
#endif
|
||||||
|
int button;
|
||||||
if (display_text(WORDS, help_text, formation, NULL))
|
if (display_text(WORDS, help_text, formation, NULL))
|
||||||
return true;
|
return true;
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -604,13 +604,16 @@ static bool spacerocks_help(void)
|
||||||
};
|
};
|
||||||
static struct style_text formation[]={
|
static struct style_text formation[]={
|
||||||
{ 0, TEXT_CENTER|TEXT_UNDERLINE },
|
{ 0, TEXT_CENTER|TEXT_UNDERLINE },
|
||||||
{ 2, C_RED }
|
{ 2, C_RED },
|
||||||
|
{ -1, 0 }
|
||||||
};
|
};
|
||||||
|
#ifdef HAVE_LCD_COLOR
|
||||||
|
rb->lcd_set_background(LCD_BLACK);
|
||||||
|
rb->lcd_set_foreground(LCD_WHITE);
|
||||||
|
#endif
|
||||||
int button;
|
int button;
|
||||||
|
|
||||||
if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
|
if (display_text(WORDS, help_text, formation, NULL)==PLUGIN_USB_CONNECTED)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
button = rb->button_get(true);
|
button = rb->button_get(true);
|
||||||
if (button == SYS_USB_CONNECTED) {
|
if (button == SYS_USB_CONNECTED) {
|
||||||
|
|
|
@ -990,8 +990,8 @@ static bool star_help(void)
|
||||||
"it", "as", "a", "mobile", "wall.", "The", "block", "cannot", "take",
|
"it", "as", "a", "mobile", "wall.", "The", "block", "cannot", "take",
|
||||||
"stars.", "", "",
|
"stars.", "", "",
|
||||||
"Controls", "",
|
"Controls", "",
|
||||||
STAR_TOGGLE_CONTROL_NAME":", "Toggle", "Control", "",
|
STAR_TOGGLE_CONTROL_NAME":", "Toggle", "control", "",
|
||||||
STAR_QUIT_NAME":", "", "Exit", "",
|
STAR_QUIT_NAME":", "Exit", "",
|
||||||
STAR_LEVEL_DOWN_NAME":", "Prev.", "level", "",
|
STAR_LEVEL_DOWN_NAME":", "Prev.", "level", "",
|
||||||
STAR_LEVEL_REPEAT_NAME":", "Reset", "level", "",
|
STAR_LEVEL_REPEAT_NAME":", "Reset", "level", "",
|
||||||
STAR_LEVEL_UP_NAME":", "Next", "level"
|
STAR_LEVEL_UP_NAME":", "Next", "level"
|
||||||
|
@ -1025,7 +1025,7 @@ static int star_menu(void)
|
||||||
/* get the size of char */
|
/* get the size of char */
|
||||||
rb->lcd_getstringsize("a", &char_width, &char_height);
|
rb->lcd_getstringsize("a", &char_width, &char_height);
|
||||||
|
|
||||||
MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Play","Choose Level",
|
MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Start Game","Choose Level",
|
||||||
"Help", "Quit");
|
"Help", "Quit");
|
||||||
|
|
||||||
while(!menu_quit)
|
while(!menu_quit)
|
||||||
|
|
|
@ -48,7 +48,7 @@ block and crosses which allow you to choose a replacement block.
|
||||||
\opt{MROBE100_PAD}{\ButtonSelect}
|
\opt{MROBE100_PAD}{\ButtonSelect}
|
||||||
\opt{SANSA_C200_PAD}{\ButtonSelect}
|
\opt{SANSA_C200_PAD}{\ButtonSelect}
|
||||||
\opt{HAVEREMOTEKEYMAP}{& }
|
\opt{HAVEREMOTEKEYMAP}{& }
|
||||||
& to select/save\\
|
& to choose peg\\
|
||||||
|
|
||||||
\opt{RECORDER_PAD}{\ButtonFTwo}
|
\opt{RECORDER_PAD}{\ButtonFTwo}
|
||||||
\opt{ONDIO_PAD}{\ButtonMenu + \ButtonRight}
|
\opt{ONDIO_PAD}{\ButtonMenu + \ButtonRight}
|
||||||
|
|
Loading…
Reference in a new issue