devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Jewels: accept FS#9947 changing 'Resume Game' in the game menu to 'Resume Saved Game' to be less confusing. Bring up the in-game menu using the regular menu button on h100/h300/gigabeat S. Add keymap to the manual for gigabeat S

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20561 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-03-28 09:21:27 +00:00
parent dca04925c6
commit 24ae50699d
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/plugins/jewels.c
View file

@ -59,6 +59,7 @@ PLUGIN_HEADER
#define JEWELS_LEFT BUTTON_LEFT #define JEWELS_LEFT BUTTON_LEFT
#define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_RIGHT BUTTON_RIGHT
#define JEWELS_SELECT BUTTON_SELECT #define JEWELS_SELECT BUTTON_SELECT
#define JEWELS_MENU BUTTON_MODE
#define JEWELS_CANCEL BUTTON_OFF #define JEWELS_CANCEL BUTTON_OFF
#define JEWELS_RC_CANCEL BUTTON_RC_STOP #define JEWELS_RC_CANCEL BUTTON_RC_STOP
@ -133,6 +134,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define JEWELS_LEFT BUTTON_LEFT #define JEWELS_LEFT BUTTON_LEFT
#define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_RIGHT BUTTON_RIGHT
#define JEWELS_SELECT BUTTON_SELECT #define JEWELS_SELECT BUTTON_SELECT
#define JEWELS_MENU BUTTON_MENU
#define JEWELS_CANCEL BUTTON_BACK #define JEWELS_CANCEL BUTTON_BACK
#elif CONFIG_KEYPAD == MROBE100_PAD #elif CONFIG_KEYPAD == MROBE100_PAD
@ -355,7 +357,7 @@ struct jewels_menu {
{"Jewels", false, 0, 6, {"Jewels", false, 0, 6,
{{"New Game", MRES_NEW}, {{"New Game", MRES_NEW},
{"Puzzle", MRES_PUZZLE}, {"Puzzle", MRES_PUZZLE},
{"Resume Game", MRES_RESUME}, {"Resume Saved Game", MRES_RESUME},
{"High Scores", MRES_SCORES}, {"High Scores", MRES_SCORES},
{"Help", MRES_HELP}, {"Help", MRES_HELP},
{"Quit", MRES_QUIT}}}, {"Quit", MRES_QUIT}}},
@ -1904,6 +1906,9 @@ static int jewels_main(struct game_context* bj) {
} }
break; break;
#ifdef JEWELS_MENU
case JEWELS_MENU:
#endif
case (JEWELS_SELECT|BUTTON_REPEAT): /* show menu */ case (JEWELS_SELECT|BUTTON_REPEAT): /* show menu */
if(!inmenu) inmenu = true; if(!inmenu) inmenu = true;
break; break;

17
manual/plugins/jewels.tex
View file

@ -13,27 +13,26 @@ after every one hundred points and randomly clears several jewels.
\begin{table} \begin{table}
\begin{btnmap}{}{} \begin{btnmap}{}{}
\ButtonLeft/\ButtonRight/\\ \ButtonLeft/\ButtonRight/\\
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD} \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
{\ButtonUp/\ButtonDown} {\ButtonUp/\ButtonDown}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
\opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown} \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
& Move the cursor around the jewels \\ & Move the cursor around the jewels \\
\opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay} \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
\opt{ONDIO_PAD}{\ButtonMenu} \opt{ONDIO_PAD}{\ButtonMenu}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
{\ButtonSelect} {\ButtonSelect}
& Select a jewel \\ & Select a jewel \\
\opt{RECORDER_PAD,IRIVER_H10_PAD}{Long \ButtonPlay}% \opt{RECORDER_PAD,IRIVER_H10_PAD}{Long \ButtonPlay}%
\opt{ONDIO_PAD}{Long \ButtonMenu}% \opt{ONDIO_PAD}{Long \ButtonMenu}%
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} or Long \ButtonSelect}
\opt{GIGABEAT_S_PAD}{\ButtonMenu{} or Long \ButtonSelect}
\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}%
{Long \ButtonSelect}% {Long \ButtonSelect}%
\nopt{IPOD_4G_PAD,IPOD_3G_PAD}{% start here because latex didn't like skipping the bottom row
& Show the in-game menu \\ & Show the in-game menu \\
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}% \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff & Exit \\}%
\opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower}% \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower & Exit \\}%
& Exit \\}%
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{% only finish this row for Ipods here
& Show the in-game menu \\}%
\end{btnmap} \end{btnmap}
\end{table} \end{table}