diff options
author | Robert Kukla <roolku@rockbox.org> | 2008-07-20 10:16:35 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2008-07-20 10:16:35 +0000 |
commit | 284cbd586ea70c2f8293ba20025262d7ae7d36ff (patch) | |
tree | cf848f7c0f1adf4d860bb2c7a6d07b8f6573d9b4 /apps | |
parent | 32dda1d2936fdd3c2e840cd60092bde3147455e5 (diff) | |
download | rockbox-284cbd586ea70c2f8293ba20025262d7ae7d36ff.tar.gz rockbox-284cbd586ea70c2f8293ba20025262d7ae7d36ff.zip |
correct overlooked POWER<->A swaps for gigabeat plugins (thanks to Firestorm ZERO for reporting) and button fix for blackjack on mr100
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18097 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/blackjack.c | 20 | ||||
-rw-r--r-- | apps/plugins/matrix.c | 2 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 0ab82df4f0..7d69e8f602 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -146,8 +146,8 @@ PLUGIN_HEADER | |||
146 | #define BJACK_LEFT BUTTON_LEFT | 146 | #define BJACK_LEFT BUTTON_LEFT |
147 | 147 | ||
148 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 148 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
149 | #define BJACK_START BUTTON_POWER | 149 | #define BJACK_START BUTTON_A |
150 | #define BJACK_QUIT BUTTON_A | 150 | #define BJACK_QUIT BUTTON_POWER |
151 | #define BJACK_MAX BUTTON_VOL_UP | 151 | #define BJACK_MAX BUTTON_VOL_UP |
152 | #define BJACK_MIN BUTTON_VOL_DOWN | 152 | #define BJACK_MIN BUTTON_VOL_DOWN |
153 | #define BJACK_HIT BUTTON_VOL_UP | 153 | #define BJACK_HIT BUTTON_VOL_UP |
@@ -228,7 +228,7 @@ PLUGIN_HEADER | |||
228 | #define BJACK_MIN BUTTON_DISPLAY | 228 | #define BJACK_MIN BUTTON_DISPLAY |
229 | #define BJACK_HIT BUTTON_MENU | 229 | #define BJACK_HIT BUTTON_MENU |
230 | #define BJACK_STAY BUTTON_DISPLAY | 230 | #define BJACK_STAY BUTTON_DISPLAY |
231 | #define BJACK_DOUBLEDOWN BUTTON_SELECT | 231 | #define BJACK_DOUBLEDOWN BUTTON_DOWN |
232 | #define BJACK_SCORES BUTTON_RIGHT | 232 | #define BJACK_SCORES BUTTON_RIGHT |
233 | #define BJACK_RESUME BUTTON_PLAY | 233 | #define BJACK_RESUME BUTTON_PLAY |
234 | #define BJACK_UP BUTTON_UP | 234 | #define BJACK_UP BUTTON_UP |
@@ -1183,8 +1183,8 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1183 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1183 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1184 | rb->lcd_puts(0, 9, str); | 1184 | rb->lcd_puts(0, 9, str); |
1185 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 1185 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
1186 | rb->lcd_puts(0, 2, "POWER to start"); | 1186 | rb->lcd_puts(0, 2, "A to start"); |
1187 | rb->lcd_puts(0, 3, "A to exit"); | 1187 | rb->lcd_puts(0, 3, "POWER to exit"); |
1188 | rb->lcd_puts(0, 4, "VOL+ to hit"); | 1188 | rb->lcd_puts(0, 4, "VOL+ to hit"); |
1189 | rb->lcd_puts(0, 5, "VOL- to stay"); | 1189 | rb->lcd_puts(0, 5, "VOL- to stay"); |
1190 | rb->lcd_puts(0, 6, "CENTER to double down"); | 1190 | rb->lcd_puts(0, 6, "CENTER to double down"); |
@@ -1192,6 +1192,16 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1192 | rb->lcd_puts(0, 8, "MENU to save/resume"); | 1192 | rb->lcd_puts(0, 8, "MENU to save/resume"); |
1193 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1193 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1194 | rb->lcd_puts(0, 9, str); | 1194 | rb->lcd_puts(0, 9, str); |
1195 | #elif CONFIG_KEYPAD == MROBE100_PAD | ||
1196 | rb->lcd_puts(0, 2, "CENTER to start"); | ||
1197 | rb->lcd_puts(0, 3, "POWER to exit"); | ||
1198 | rb->lcd_puts(0, 4, "MENU to hit"); | ||
1199 | rb->lcd_puts(0, 5, "DISPLAY to stay"); | ||
1200 | rb->lcd_puts(0, 6, "DOWN to double down"); | ||
1201 | rb->lcd_puts(0, 6, "RIGHT to view highscores "); | ||
1202 | rb->lcd_puts(0, 8, "PLAY to save/resume"); | ||
1203 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | ||
1204 | rb->lcd_puts(0, 9, str); | ||
1195 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 1205 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
1196 | rb->lcd_puts(0, 2, "SELECT to start & to hit"); | 1206 | rb->lcd_puts(0, 2, "SELECT to start & to hit"); |
1197 | rb->lcd_puts(0, 3, "POWER to exit"); | 1207 | rb->lcd_puts(0, 3, "POWER to exit"); |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 8a4a629669..2b63be90e7 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -73,7 +73,7 @@ extern const fb_data matrix_normal[]; | |||
73 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 73 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |
74 | #define MATRIX_PAUSE BUTTON_PLAY | 74 | #define MATRIX_PAUSE BUTTON_PLAY |
75 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 75 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
76 | #define MATRIX_EXIT BUTTON_A | 76 | #define MATRIX_EXIT BUTTON_POWER |
77 | #define MATRIX_SLEEP_MORE BUTTON_UP | 77 | #define MATRIX_SLEEP_MORE BUTTON_UP |
78 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 78 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |
79 | #define MATRIX_PAUSE BUTTON_SELECT | 79 | #define MATRIX_PAUSE BUTTON_SELECT |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 387a180828..35ce9daa83 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -63,7 +63,7 @@ static int plasma_frequency; | |||
63 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK | 63 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK |
64 | 64 | ||
65 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 65 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
66 | #define PLASMA_QUIT BUTTON_A | 66 | #define PLASMA_QUIT BUTTON_POWER |
67 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 67 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
68 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 68 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
69 | 69 | ||