From 294a4c0ef9d2cd2cabf142dcaea842f2a07e8ba2 Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Tue, 16 Oct 2007 20:08:19 +0000 Subject: Blackjack: small improvement in the c200 buttonmap - use the volume buttons instead of a combo, add the missing help text. Fill out the blank button table in the c200 manual. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15149 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/blackjack.c | 18 +++++++++++++----- 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 #elif CONFIG_KEYPAD == SANSA_C200_PAD #define BJACK_START BUTTON_SELECT #define BJACK_QUIT BUTTON_POWER -#define BJACK_MAX (BUTTON_REC|BUTTON_UP) -#define BJACK_MIN (BUTTON_REC|BUTTON_VOL_DOWN) +#define BJACK_MAX BUTTON_VOL_UP +#define BJACK_MIN BUTTON_VOL_DOWN #define BJACK_HIT BUTTON_SELECT #define BJACK_STAY BUTTON_RIGHT #define BJACK_DOUBLEDOWN BUTTON_LEFT -#define BJACK_SCORES BUTTON_VOL_UP -#define BJACK_RESUME BUTTON_REC +#define BJACK_SCORES BUTTON_REC +#define BJACK_RESUME BUTTON_DOWN #define BJACK_UP BUTTON_UP #define BJACK_DOWN BUTTON_DOWN #define BJACK_RIGHT BUTTON_RIGHT @@ -1113,7 +1113,15 @@ static unsigned int blackjack_menu(struct game_context* bj) { rb->lcd_puts(0, 7, "UP to view scores"); rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); rb->lcd_puts(0, 8, str); - +#elif (CONFIG_KEYPAD == SANSA_C200_PAD) + rb->lcd_puts(0, 2, "SELECT to start & to hit"); + rb->lcd_puts(0, 3, "POWER to exit"); + rb->lcd_puts(0, 4, "RIGHT to stay"); + rb->lcd_puts(0, 5, "LEFT to double down"); + rb->lcd_puts(0, 6, "DOWN to save/resume"); + rb->lcd_puts(0, 7, "REC to view scores"); + rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); + rb->lcd_puts(0, 9, str); #endif } else { 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\\ \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} \opt{GIGABEAT_PAD}{\ButtonPower} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} - \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect} + \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect} \opt{ONDIO_PAD}{\ButtonMenu} & Start new game\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} - \opt{ONDIO_PAD,IAUDIO_X5_PAD}{\ButtonDown} + \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown} \opt{IRIVER_H10_PAD}{\ButtonRight} \opt{SANSA_E200_PAD}{\ButtonRec} \opt{GIGABEAT_PAD}{\ButtonMenu} @@ -32,15 +32,16 @@ visit\\ \opt{RECORDER_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonRight} \opt{ONDIO_PAD,SANSA_E200_PAD}{\ButtonUp} \opt{IRIVER_H10_PAD}{\ButtonLeft} + \opt{SANSA_C200_PAD}{\ButtonRec} & Show high scores\\ \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} - \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower} + \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower} \opt{GIGABEAT_PAD}{\ButtonA} & Quit\\\hline \multicolumn{2}{c}{\textbf{In game}}\\\hline \ButtonLeft/\ButtonRight/\\ - \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD} + \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_C200_PAD} {\ButtonUp/\ButtonDown} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack} \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown} @@ -48,14 +49,14 @@ visit\\ \opt{RECORDER_PAD}{\ButtonFOne} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} \opt{IRIVER_H10_PAD}{\ButtonPlay} - \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect} + \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonSelect} \opt{ONDIO_PAD}{\ButtonLeft} \opt{GIGABEAT_PAD}{\ButtonVolUp} & Hit (Draw new card)\\ \opt{RECORDER_PAD}{\ButtonFTwo} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec} \opt{IRIVER_H10_PAD}{\ButtonFF} - \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonRight} + \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRight} \opt{GIGABEAT_PAD}{\ButtonVolDown} & Stay (End hand)\\ \opt{RECORDER_PAD}{\ButtonFThree} @@ -63,18 +64,18 @@ visit\\ \opt{IAUDIO_X5_PAD}{\ButtonPlay} \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{ONDIO_PAD}{\ButtonUp} - \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonLeft} + \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonLeft} & Double down\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} - \opt{ONDIO_PAD,IAUDIO_X5_PAD}{\ButtonDown} + \opt{ONDIO_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonDown} \opt{IRIVER_H10_PAD}{\ButtonRight} \opt{SANSA_E200_PAD}{\ButtonRec} \opt{GIGABEAT_PAD}{\ButtonMenu} & Save game\\ \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} - \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower} + \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonPower} \opt{GIGABEAT_PAD}{\ButtonA} & Return to menu or cancel\\\hline \end{btnmap} -- cgit