Accept FS#10068 by Teruaki Kawashima correcting the instructions built into a couple of plugins

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20565 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-03-29 10:41:31 +00:00
parent faa22f6c54
commit cc5400d9cf
5 changed files with 44 additions and 10 deletions

View file

@ -1258,18 +1258,28 @@ static unsigned int blackjack_menu(struct game_context* bj) {
rb->lcd_puts(0, 3, "POWER to exit"); rb->lcd_puts(0, 3, "POWER to exit");
rb->lcd_puts(0, 4, "VOL+ to hit"); rb->lcd_puts(0, 4, "VOL+ to hit");
rb->lcd_puts(0, 5, "VOL- to stay"); rb->lcd_puts(0, 5, "VOL- to stay");
rb->lcd_puts(0, 6, "CENTER to double down"); rb->lcd_puts(0, 6, "SELECT to double down");
rb->lcd_puts(0, 6, "RIGHT to view highscores "); rb->lcd_puts(0, 7, "RIGHT to view highscores ");
rb->lcd_puts(0, 8, "MENU to save/resume");
rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
rb->lcd_puts(0, 9, str);
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
rb->lcd_puts(0, 2, "PLAY to start");
rb->lcd_puts(0, 3, "BACK to exit");
rb->lcd_puts(0, 4, "VOL+ to hit");
rb->lcd_puts(0, 5, "VOL- to stay");
rb->lcd_puts(0, 6, "SELECT to double down");
rb->lcd_puts(0, 7, "RIGHT to view highscores ");
rb->lcd_puts(0, 8, "MENU to save/resume"); rb->lcd_puts(0, 8, "MENU to save/resume");
rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
rb->lcd_puts(0, 9, str); rb->lcd_puts(0, 9, str);
#elif CONFIG_KEYPAD == MROBE100_PAD #elif CONFIG_KEYPAD == MROBE100_PAD
rb->lcd_puts(0, 2, "CENTER to start"); rb->lcd_puts(0, 2, "SELECT to start");
rb->lcd_puts(0, 3, "POWER to exit"); rb->lcd_puts(0, 3, "POWER to exit");
rb->lcd_puts(0, 4, "MENU to hit"); rb->lcd_puts(0, 4, "MENU to hit");
rb->lcd_puts(0, 5, "DISPLAY to stay"); rb->lcd_puts(0, 5, "DISPLAY to stay");
rb->lcd_puts(0, 6, "DOWN to double down"); rb->lcd_puts(0, 6, "DOWN to double down");
rb->lcd_puts(0, 6, "RIGHT to view highscores "); rb->lcd_puts(0, 7, "RIGHT to view highscores ");
rb->lcd_puts(0, 8, "PLAY to save/resume"); rb->lcd_puts(0, 8, "PLAY to save/resume");
rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]);
rb->lcd_puts(0, 9, str); rb->lcd_puts(0, 9, str);

View file

@ -722,6 +722,12 @@ enum plugin_status plugin_start(const void* parameter)
rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle"); rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle");
rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution"); rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution");
rb->lcd_putsxy(2, 48, "[PL-UP] step by step"); rb->lcd_putsxy(2, 48, "[PL-UP] step by step");
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
rb->lcd_putsxy(2, 8, "[BACK] to stop");
rb->lcd_putsxy(2, 18, "[SELECT] toggle");
rb->lcd_putsxy(2, 28, "[MENU] shuffle");
rb->lcd_putsxy(2, 38, "[VOL+] solution");
rb->lcd_putsxy(2, 48, "[VOL-] step by step");
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
(CONFIG_KEYPAD == SANSA_C200_PAD) (CONFIG_KEYPAD == SANSA_C200_PAD)
rb->lcd_putsxy(2, 8, "[POWER] to stop"); rb->lcd_putsxy(2, 8, "[POWER] to stop");

View file

@ -682,7 +682,7 @@ enum plugin_status plugin_start(
rb->lcd_putsxy(0, 28, "[REC] shuffle"); rb->lcd_putsxy(0, 28, "[REC] shuffle");
rb->lcd_putsxy(0, 38, "[PLAY] change pic"); rb->lcd_putsxy(0, 38, "[PLAY] change pic");
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
rb->lcd_putsxy(0, 18, "[OFF] to stop"); rb->lcd_putsxy(0, 18, "[POWER] to stop");
rb->lcd_putsxy(0, 28, "[SELECT] shuffle"); rb->lcd_putsxy(0, 28, "[SELECT] shuffle");
rb->lcd_putsxy(0, 38, "[A] change pic"); rb->lcd_putsxy(0, 38, "[A] change pic");
#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
@ -694,6 +694,10 @@ enum plugin_status plugin_start(
rb->lcd_putsxy(0, 18, "[OFF] to stop"); rb->lcd_putsxy(0, 18, "[OFF] to stop");
rb->lcd_putsxy(0, 28, "[REW] shuffle"); rb->lcd_putsxy(0, 28, "[REW] shuffle");
rb->lcd_putsxy(0, 38, "[PLAY] change pic"); rb->lcd_putsxy(0, 38, "[PLAY] change pic");
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
rb->lcd_putsxy(0, 18, "[BACK] to stop");
rb->lcd_putsxy(0, 28, "[SELECT] shuffle");
rb->lcd_putsxy(0, 38, "[MENU] change pic");
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
rb->lcd_putsxy(0, 18, "[REC] to stop"); rb->lcd_putsxy(0, 18, "[REC] to stop");
rb->lcd_putsxy(0, 28, "[MODE] shuffle"); rb->lcd_putsxy(0, 28, "[MODE] shuffle");

View file

@ -1335,6 +1335,13 @@ static int sokoban_menu(void)
rb->lcd_putsxy(3, 36, "[SELECT+DOWN] Previous Level"); rb->lcd_putsxy(3, 36, "[SELECT+DOWN] Previous Level");
rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Restart Level"); rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Restart Level");
rb->lcd_putsxy(3, 56, "[SELECT+UP] Next Level"); rb->lcd_putsxy(3, 56, "[SELECT+UP] Next Level");
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
rb->lcd_putsxy(3, 6, "[MENU] Menu");
rb->lcd_putsxy(3, 16, "[VOL+] Undo");
rb->lcd_putsxy(3, 26, "[VOL-] Redo");
rb->lcd_putsxy(3, 36, "[PREV] Previous Level");
rb->lcd_putsxy(3, 46, "[PLAY] Restart Level");
rb->lcd_putsxy(3, 56, "[NEXT] Next Level");
#endif #endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN

View file

@ -1086,11 +1086,11 @@ static int star_menu(void)
"[REC] Next level", true); "[REC] Next level", true);
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
star_display_text("KEYS\n\n" star_display_text("KEYS\n\n"
"[MENU] Toggle Control\n" "[SELECT] Toggle Control\n"
"[A] Exit\n" "[POWER] Exit\n"
"[PWR+DOWN] Prev. level\n" "[VOL DOWN] Prev. level\n"
"[PWR+RIGHT] Reset level\n" "[A] Reset level\n"
"[PWR+UP] Next level", true); "[VOL UP] Next level", true);
#elif CONFIG_KEYPAD == IRIVER_H10_PAD #elif CONFIG_KEYPAD == IRIVER_H10_PAD
star_display_text("KEYS\n\n" star_display_text("KEYS\n\n"
"[REW] Toggle Ctl\n" "[REW] Toggle Ctl\n"
@ -1098,6 +1098,13 @@ static int star_menu(void)
"[PLAY+DOWN] Prev. level\n" "[PLAY+DOWN] Prev. level\n"
"[PLAY+RIGHT] Reset level\n" "[PLAY+RIGHT] Reset level\n"
"[PLAY+UP] Next level", true); "[PLAY+UP] Next level", true);
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
star_display_text("KEYS\n\n"
"[SELECT] Toggle Control\n"
"[BACK] Exit\n"
"[VOL DOWN] Prev. level\n"
"[MENU] Reset level\n"
"[VOL UP] Next level", true);
#endif #endif
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
star_display_text("KEYS\n\n" star_display_text("KEYS\n\n"