diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-03-29 10:41:31 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-03-29 10:41:31 +0000 |
commit | cc5400d9cf64474d3d0e8c2a006a6078a189cd50 (patch) | |
tree | 9495a357235e3e30e3bcc40398e2242422894df3 /apps | |
parent | faa22f6c54e173fc6858af09621935d03c808cbf (diff) | |
download | rockbox-cc5400d9cf64474d3d0e8c2a006a6078a189cd50.tar.gz rockbox-cc5400d9cf64474d3d0e8c2a006a6078a189cd50.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/blackjack.c | 18 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 6 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 6 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 7 | ||||
-rw-r--r-- | apps/plugins/star.c | 17 |
5 files changed, 44 insertions, 10 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index cb0a653db9..825d5544e2 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -1258,18 +1258,28 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1258 | rb->lcd_puts(0, 3, "POWER to exit"); | 1258 | rb->lcd_puts(0, 3, "POWER to exit"); |
1259 | rb->lcd_puts(0, 4, "VOL+ to hit"); | 1259 | rb->lcd_puts(0, 4, "VOL+ to hit"); |
1260 | rb->lcd_puts(0, 5, "VOL- to stay"); | 1260 | rb->lcd_puts(0, 5, "VOL- to stay"); |
1261 | rb->lcd_puts(0, 6, "CENTER to double down"); | 1261 | rb->lcd_puts(0, 6, "SELECT to double down"); |
1262 | rb->lcd_puts(0, 6, "RIGHT to view highscores "); | 1262 | rb->lcd_puts(0, 7, "RIGHT to view highscores "); |
1263 | rb->lcd_puts(0, 8, "MENU to save/resume"); | ||
1264 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | ||
1265 | rb->lcd_puts(0, 9, str); | ||
1266 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
1267 | rb->lcd_puts(0, 2, "PLAY to start"); | ||
1268 | rb->lcd_puts(0, 3, "BACK to exit"); | ||
1269 | rb->lcd_puts(0, 4, "VOL+ to hit"); | ||
1270 | rb->lcd_puts(0, 5, "VOL- to stay"); | ||
1271 | rb->lcd_puts(0, 6, "SELECT to double down"); | ||
1272 | rb->lcd_puts(0, 7, "RIGHT to view highscores "); | ||
1263 | rb->lcd_puts(0, 8, "MENU to save/resume"); | 1273 | rb->lcd_puts(0, 8, "MENU to save/resume"); |
1264 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1274 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1265 | rb->lcd_puts(0, 9, str); | 1275 | rb->lcd_puts(0, 9, str); |
1266 | #elif CONFIG_KEYPAD == MROBE100_PAD | 1276 | #elif CONFIG_KEYPAD == MROBE100_PAD |
1267 | rb->lcd_puts(0, 2, "CENTER to start"); | 1277 | rb->lcd_puts(0, 2, "SELECT to start"); |
1268 | rb->lcd_puts(0, 3, "POWER to exit"); | 1278 | rb->lcd_puts(0, 3, "POWER to exit"); |
1269 | rb->lcd_puts(0, 4, "MENU to hit"); | 1279 | rb->lcd_puts(0, 4, "MENU to hit"); |
1270 | rb->lcd_puts(0, 5, "DISPLAY to stay"); | 1280 | rb->lcd_puts(0, 5, "DISPLAY to stay"); |
1271 | rb->lcd_puts(0, 6, "DOWN to double down"); | 1281 | rb->lcd_puts(0, 6, "DOWN to double down"); |
1272 | rb->lcd_puts(0, 6, "RIGHT to view highscores "); | 1282 | rb->lcd_puts(0, 7, "RIGHT to view highscores "); |
1273 | rb->lcd_puts(0, 8, "PLAY to save/resume"); | 1283 | rb->lcd_puts(0, 8, "PLAY to save/resume"); |
1274 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1284 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1275 | rb->lcd_puts(0, 9, str); | 1285 | rb->lcd_puts(0, 9, str); |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index ae0b1dbaf5..a1807b4af9 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -722,6 +722,12 @@ enum plugin_status plugin_start(const void* parameter) | |||
722 | rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle"); | 722 | rb->lcd_putsxy(2, 28, "[PL-LEFT] shuffle"); |
723 | rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution"); | 723 | rb->lcd_putsxy(2, 38, "[PL-RIGHT] solution"); |
724 | rb->lcd_putsxy(2, 48, "[PL-UP] step by step"); | 724 | rb->lcd_putsxy(2, 48, "[PL-UP] step by step"); |
725 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
726 | rb->lcd_putsxy(2, 8, "[BACK] to stop"); | ||
727 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); | ||
728 | rb->lcd_putsxy(2, 28, "[MENU] shuffle"); | ||
729 | rb->lcd_putsxy(2, 38, "[VOL+] solution"); | ||
730 | rb->lcd_putsxy(2, 48, "[VOL-] step by step"); | ||
725 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 731 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
726 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 732 | (CONFIG_KEYPAD == SANSA_C200_PAD) |
727 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); | 733 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index c5c8c67d25..df8e445f93 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -682,7 +682,7 @@ enum plugin_status plugin_start( | |||
682 | rb->lcd_putsxy(0, 28, "[REC] shuffle"); | 682 | rb->lcd_putsxy(0, 28, "[REC] shuffle"); |
683 | rb->lcd_putsxy(0, 38, "[PLAY] change pic"); | 683 | rb->lcd_putsxy(0, 38, "[PLAY] change pic"); |
684 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 684 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
685 | rb->lcd_putsxy(0, 18, "[OFF] to stop"); | 685 | rb->lcd_putsxy(0, 18, "[POWER] to stop"); |
686 | rb->lcd_putsxy(0, 28, "[SELECT] shuffle"); | 686 | rb->lcd_putsxy(0, 28, "[SELECT] shuffle"); |
687 | rb->lcd_putsxy(0, 38, "[A] change pic"); | 687 | rb->lcd_putsxy(0, 38, "[A] change pic"); |
688 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 688 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
@@ -694,6 +694,10 @@ enum plugin_status plugin_start( | |||
694 | rb->lcd_putsxy(0, 18, "[OFF] to stop"); | 694 | rb->lcd_putsxy(0, 18, "[OFF] to stop"); |
695 | rb->lcd_putsxy(0, 28, "[REW] shuffle"); | 695 | rb->lcd_putsxy(0, 28, "[REW] shuffle"); |
696 | rb->lcd_putsxy(0, 38, "[PLAY] change pic"); | 696 | rb->lcd_putsxy(0, 38, "[PLAY] change pic"); |
697 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
698 | rb->lcd_putsxy(0, 18, "[BACK] to stop"); | ||
699 | rb->lcd_putsxy(0, 28, "[SELECT] shuffle"); | ||
700 | rb->lcd_putsxy(0, 38, "[MENU] change pic"); | ||
697 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 701 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
698 | rb->lcd_putsxy(0, 18, "[REC] to stop"); | 702 | rb->lcd_putsxy(0, 18, "[REC] to stop"); |
699 | rb->lcd_putsxy(0, 28, "[MODE] shuffle"); | 703 | rb->lcd_putsxy(0, 28, "[MODE] shuffle"); |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index e8ccdaca10..f071af14f4 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -1335,6 +1335,13 @@ static int sokoban_menu(void) | |||
1335 | rb->lcd_putsxy(3, 36, "[SELECT+DOWN] Previous Level"); | 1335 | rb->lcd_putsxy(3, 36, "[SELECT+DOWN] Previous Level"); |
1336 | rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Restart Level"); | 1336 | rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Restart Level"); |
1337 | rb->lcd_putsxy(3, 56, "[SELECT+UP] Next Level"); | 1337 | rb->lcd_putsxy(3, 56, "[SELECT+UP] Next Level"); |
1338 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
1339 | rb->lcd_putsxy(3, 6, "[MENU] Menu"); | ||
1340 | rb->lcd_putsxy(3, 16, "[VOL+] Undo"); | ||
1341 | rb->lcd_putsxy(3, 26, "[VOL-] Redo"); | ||
1342 | rb->lcd_putsxy(3, 36, "[PREV] Previous Level"); | ||
1343 | rb->lcd_putsxy(3, 46, "[PLAY] Restart Level"); | ||
1344 | rb->lcd_putsxy(3, 56, "[NEXT] Next Level"); | ||
1338 | #endif | 1345 | #endif |
1339 | 1346 | ||
1340 | #ifdef HAVE_TOUCHSCREEN | 1347 | #ifdef HAVE_TOUCHSCREEN |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index c4251cd223..344c11bc56 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -1086,11 +1086,11 @@ static int star_menu(void) | |||
1086 | "[REC] Next level", true); | 1086 | "[REC] Next level", true); |
1087 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 1087 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
1088 | star_display_text("KEYS\n\n" | 1088 | star_display_text("KEYS\n\n" |
1089 | "[MENU] Toggle Control\n" | 1089 | "[SELECT] Toggle Control\n" |
1090 | "[A] Exit\n" | 1090 | "[POWER] Exit\n" |
1091 | "[PWR+DOWN] Prev. level\n" | 1091 | "[VOL DOWN] Prev. level\n" |
1092 | "[PWR+RIGHT] Reset level\n" | 1092 | "[A] Reset level\n" |
1093 | "[PWR+UP] Next level", true); | 1093 | "[VOL UP] Next level", true); |
1094 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 1094 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
1095 | star_display_text("KEYS\n\n" | 1095 | star_display_text("KEYS\n\n" |
1096 | "[REW] Toggle Ctl\n" | 1096 | "[REW] Toggle Ctl\n" |
@@ -1098,6 +1098,13 @@ static int star_menu(void) | |||
1098 | "[PLAY+DOWN] Prev. level\n" | 1098 | "[PLAY+DOWN] Prev. level\n" |
1099 | "[PLAY+RIGHT] Reset level\n" | 1099 | "[PLAY+RIGHT] Reset level\n" |
1100 | "[PLAY+UP] Next level", true); | 1100 | "[PLAY+UP] Next level", true); |
1101 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
1102 | star_display_text("KEYS\n\n" | ||
1103 | "[SELECT] Toggle Control\n" | ||
1104 | "[BACK] Exit\n" | ||
1105 | "[VOL DOWN] Prev. level\n" | ||
1106 | "[MENU] Reset level\n" | ||
1107 | "[VOL UP] Next level", true); | ||
1101 | #endif | 1108 | #endif |
1102 | #ifdef HAVE_TOUCHSCREEN | 1109 | #ifdef HAVE_TOUCHSCREEN |
1103 | star_display_text("KEYS\n\n" | 1110 | star_display_text("KEYS\n\n" |