diff options
-rw-r--r-- | apps/plugins/blackjack.c | 18 | ||||
-rw-r--r-- | manual/plugins/blackjack.tex | 19 |
2 files changed, 23 insertions, 14 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 2ece48d75d..421326e9c0 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -176,13 +176,13 @@ PLUGIN_HEADER | |||
176 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 176 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
177 | #define BJACK_START BUTTON_SELECT | 177 | #define BJACK_START BUTTON_SELECT |
178 | #define BJACK_QUIT BUTTON_POWER | 178 | #define BJACK_QUIT BUTTON_POWER |
179 | #define BJACK_MAX (BUTTON_REC|BUTTON_UP) | 179 | #define BJACK_MAX BUTTON_VOL_UP |
180 | #define BJACK_MIN (BUTTON_REC|BUTTON_VOL_DOWN) | 180 | #define BJACK_MIN BUTTON_VOL_DOWN |
181 | #define BJACK_HIT BUTTON_SELECT | 181 | #define BJACK_HIT BUTTON_SELECT |
182 | #define BJACK_STAY BUTTON_RIGHT | 182 | #define BJACK_STAY BUTTON_RIGHT |
183 | #define BJACK_DOUBLEDOWN BUTTON_LEFT | 183 | #define BJACK_DOUBLEDOWN BUTTON_LEFT |
184 | #define BJACK_SCORES BUTTON_VOL_UP | 184 | #define BJACK_SCORES BUTTON_REC |
185 | #define BJACK_RESUME BUTTON_REC | 185 | #define BJACK_RESUME BUTTON_DOWN |
186 | #define BJACK_UP BUTTON_UP | 186 | #define BJACK_UP BUTTON_UP |
187 | #define BJACK_DOWN BUTTON_DOWN | 187 | #define BJACK_DOWN BUTTON_DOWN |
188 | #define BJACK_RIGHT BUTTON_RIGHT | 188 | #define BJACK_RIGHT BUTTON_RIGHT |
@@ -1113,7 +1113,15 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1113 | rb->lcd_puts(0, 7, "UP to view scores"); | 1113 | rb->lcd_puts(0, 7, "UP to view scores"); |
1114 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1114 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1115 | rb->lcd_puts(0, 8, str); | 1115 | rb->lcd_puts(0, 8, str); |
1116 | 1116 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | |
1117 | rb->lcd_puts(0, 2, "SELECT to start & to hit"); | ||
1118 | rb->lcd_puts(0, 3, "POWER to exit"); | ||
1119 | rb->lcd_puts(0, 4, "RIGHT to stay"); | ||
1120 | rb->lcd_puts(0, 5, "LEFT to double down"); | ||
1121 | rb->lcd_puts(0, 6, "DOWN to save/resume"); | ||
1122 | rb->lcd_puts(0, 7, "REC to view scores"); | ||
1123 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | ||
1124 | rb->lcd_puts(0, 9, str); | ||
1117 | #endif | 1125 | #endif |
1118 | } else { | 1126 | } else { |
1119 | rb->snprintf(str, 12, "%s", "High Scores"); | 1127 | rb->snprintf(str, 12, "%s", "High Scores"); |
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex index 7a7caa491a..2466014c81 100644 --- a/manual/plugins/blackjack.tex +++ b/manual/plugins/blackjack.tex | |||
@@ -18,12 +18,12 @@ visit\\ | |||
18 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} | 18 | \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} |
19 | \opt{GIGABEAT_PAD}{\ButtonPower} | 19 | \opt{GIGABEAT_PAD}{\ButtonPower} |
20 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} | 20 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} |
21 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect} | 21 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect} |
22 | \opt{ONDIO_PAD}{\ButtonMenu} | 22 | \opt{ONDIO_PAD}{\ButtonMenu} |
23 | & Start new game\\ | 23 | & Start new game\\ |
24 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} | 24 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} |
25 | \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} | 25 | \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} |
26 | \opt{ONDIO_PAD,IAUDIO_X5_PAD}{\ButtonDown} | 26 | \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown} |
27 | \opt{IRIVER_H10_PAD}{\ButtonRight} | 27 | \opt{IRIVER_H10_PAD}{\ButtonRight} |
28 | \opt{SANSA_E200_PAD}{\ButtonRec} | 28 | \opt{SANSA_E200_PAD}{\ButtonRec} |
29 | \opt{GIGABEAT_PAD}{\ButtonMenu} | 29 | \opt{GIGABEAT_PAD}{\ButtonMenu} |
@@ -32,15 +32,16 @@ visit\\ | |||
32 | \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonRight} | 32 | \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonRight} |
33 | \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonUp} | 33 | \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonUp} |
34 | \opt{IRIVER_H10_PAD}{\ButtonLeft} | 34 | \opt{IRIVER_H10_PAD}{\ButtonLeft} |
35 | \opt{SANSA_C200_PAD}{\ButtonRec} | ||
35 | & Show high scores\\ | 36 | & Show high scores\\ |
36 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} | 37 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} |
37 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} | 38 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} |
38 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower} | 39 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower} |
39 | \opt{GIGABEAT_PAD}{\ButtonA} | 40 | \opt{GIGABEAT_PAD}{\ButtonA} |
40 | & Quit\\\hline | 41 | & Quit\\\hline |
41 | \multicolumn{2}{c}{\textbf{In game}}\\\hline | 42 | \multicolumn{2}{c}{\textbf{In game}}\\\hline |
42 | \ButtonLeft/\ButtonRight/\\ | 43 | \ButtonLeft/\ButtonRight/\\ |
43 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD} | 44 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_C200_PAD} |
44 | {\ButtonUp/\ButtonDown} | 45 | {\ButtonUp/\ButtonDown} |
45 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack} | 46 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack} |
46 | \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown} | 47 | \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown} |
@@ -48,14 +49,14 @@ visit\\ | |||
48 | \opt{RECORDER_PAD}{\ButtonFOne} | 49 | \opt{RECORDER_PAD}{\ButtonFOne} |
49 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} | 50 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} |
50 | \opt{IRIVER_H10_PAD}{\ButtonPlay} | 51 | \opt{IRIVER_H10_PAD}{\ButtonPlay} |
51 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect} | 52 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect} |
52 | \opt{ONDIO_PAD}{\ButtonLeft} | 53 | \opt{ONDIO_PAD}{\ButtonLeft} |
53 | \opt{GIGABEAT_PAD}{\ButtonVolUp} | 54 | \opt{GIGABEAT_PAD}{\ButtonVolUp} |
54 | & Hit (Draw new card)\\ | 55 | & Hit (Draw new card)\\ |
55 | \opt{RECORDER_PAD}{\ButtonFTwo} | 56 | \opt{RECORDER_PAD}{\ButtonFTwo} |
56 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec} | 57 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec} |
57 | \opt{IRIVER_H10_PAD}{\ButtonFF} | 58 | \opt{IRIVER_H10_PAD}{\ButtonFF} |
58 | \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonRight} | 59 | \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight} |
59 | \opt{GIGABEAT_PAD}{\ButtonVolDown} | 60 | \opt{GIGABEAT_PAD}{\ButtonVolDown} |
60 | & Stay (End hand)\\ | 61 | & Stay (End hand)\\ |
61 | \opt{RECORDER_PAD}{\ButtonFThree} | 62 | \opt{RECORDER_PAD}{\ButtonFThree} |
@@ -63,18 +64,18 @@ visit\\ | |||
63 | \opt{IAUDIO_X5_PAD}{\ButtonPlay} | 64 | \opt{IAUDIO_X5_PAD}{\ButtonPlay} |
64 | \opt{IRIVER_H10_PAD}{\ButtonRew} | 65 | \opt{IRIVER_H10_PAD}{\ButtonRew} |
65 | \opt{ONDIO_PAD}{\ButtonUp} | 66 | \opt{ONDIO_PAD}{\ButtonUp} |
66 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonLeft} | 67 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft} |
67 | & Double down\\ | 68 | & Double down\\ |
68 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} | 69 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} |
69 | \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} | 70 | \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} |
70 | \opt{ONDIO_PAD,IAUDIO_X5_PAD}{\ButtonDown} | 71 | \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown} |
71 | \opt{IRIVER_H10_PAD}{\ButtonRight} | 72 | \opt{IRIVER_H10_PAD}{\ButtonRight} |
72 | \opt{SANSA_E200_PAD}{\ButtonRec} | 73 | \opt{SANSA_E200_PAD}{\ButtonRec} |
73 | \opt{GIGABEAT_PAD}{\ButtonMenu} | 74 | \opt{GIGABEAT_PAD}{\ButtonMenu} |
74 | & Save game\\ | 75 | & Save game\\ |
75 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} | 76 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} |
76 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} | 77 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} |
77 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower} | 78 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower} |
78 | \opt{GIGABEAT_PAD}{\ButtonA} | 79 | \opt{GIGABEAT_PAD}{\ButtonA} |
79 | & Return to menu or cancel\\\hline | 80 | & Return to menu or cancel\\\hline |
80 | \end{btnmap} | 81 | \end{btnmap} |