diff options
-rw-r--r-- | apps/plugins/jewels.c | 7 | ||||
-rw-r--r-- | manual/plugins/jewels.tex | 17 |
2 files changed, 14 insertions, 10 deletions
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 00839af48d..9fa9a2e413 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -59,6 +59,7 @@ PLUGIN_HEADER | |||
59 | #define JEWELS_LEFT BUTTON_LEFT | 59 | #define JEWELS_LEFT BUTTON_LEFT |
60 | #define JEWELS_RIGHT BUTTON_RIGHT | 60 | #define JEWELS_RIGHT BUTTON_RIGHT |
61 | #define JEWELS_SELECT BUTTON_SELECT | 61 | #define JEWELS_SELECT BUTTON_SELECT |
62 | #define JEWELS_MENU BUTTON_MODE | ||
62 | #define JEWELS_CANCEL BUTTON_OFF | 63 | #define JEWELS_CANCEL BUTTON_OFF |
63 | #define JEWELS_RC_CANCEL BUTTON_RC_STOP | 64 | #define JEWELS_RC_CANCEL BUTTON_RC_STOP |
64 | 65 | ||
@@ -133,6 +134,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
133 | #define JEWELS_LEFT BUTTON_LEFT | 134 | #define JEWELS_LEFT BUTTON_LEFT |
134 | #define JEWELS_RIGHT BUTTON_RIGHT | 135 | #define JEWELS_RIGHT BUTTON_RIGHT |
135 | #define JEWELS_SELECT BUTTON_SELECT | 136 | #define JEWELS_SELECT BUTTON_SELECT |
137 | #define JEWELS_MENU BUTTON_MENU | ||
136 | #define JEWELS_CANCEL BUTTON_BACK | 138 | #define JEWELS_CANCEL BUTTON_BACK |
137 | 139 | ||
138 | #elif CONFIG_KEYPAD == MROBE100_PAD | 140 | #elif CONFIG_KEYPAD == MROBE100_PAD |
@@ -355,7 +357,7 @@ struct jewels_menu { | |||
355 | {"Jewels", false, 0, 6, | 357 | {"Jewels", false, 0, 6, |
356 | {{"New Game", MRES_NEW}, | 358 | {{"New Game", MRES_NEW}, |
357 | {"Puzzle", MRES_PUZZLE}, | 359 | {"Puzzle", MRES_PUZZLE}, |
358 | {"Resume Game", MRES_RESUME}, | 360 | {"Resume Saved Game", MRES_RESUME}, |
359 | {"High Scores", MRES_SCORES}, | 361 | {"High Scores", MRES_SCORES}, |
360 | {"Help", MRES_HELP}, | 362 | {"Help", MRES_HELP}, |
361 | {"Quit", MRES_QUIT}}}, | 363 | {"Quit", MRES_QUIT}}}, |
@@ -1904,6 +1906,9 @@ static int jewels_main(struct game_context* bj) { | |||
1904 | } | 1906 | } |
1905 | break; | 1907 | break; |
1906 | 1908 | ||
1909 | #ifdef JEWELS_MENU | ||
1910 | case JEWELS_MENU: | ||
1911 | #endif | ||
1907 | case (JEWELS_SELECT|BUTTON_REPEAT): /* show menu */ | 1912 | case (JEWELS_SELECT|BUTTON_REPEAT): /* show menu */ |
1908 | if(!inmenu) inmenu = true; | 1913 | if(!inmenu) inmenu = true; |
1909 | break; | 1914 | break; |
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex index 36ab6eb494..bd9aa6addf 100644 --- a/manual/plugins/jewels.tex +++ b/manual/plugins/jewels.tex | |||
@@ -13,27 +13,26 @@ after every one hundred points and randomly clears several jewels. | |||
13 | \begin{table} | 13 | \begin{table} |
14 | \begin{btnmap}{}{} | 14 | \begin{btnmap}{}{} |
15 | \ButtonLeft/\ButtonRight/\\ | 15 | \ButtonLeft/\ButtonRight/\\ |
16 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD} | 16 | \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} |
17 | {\ButtonUp/\ButtonDown} | 17 | {\ButtonUp/\ButtonDown} |
18 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay} | 18 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay} |
19 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown} | 19 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown} |
20 | & Move the cursor around the jewels \\ | 20 | & Move the cursor around the jewels \\ |
21 | \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay} | 21 | \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay} |
22 | \opt{ONDIO_PAD}{\ButtonMenu} | 22 | \opt{ONDIO_PAD}{\ButtonMenu} |
23 | \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} | 23 | \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} |
24 | {\ButtonSelect} | 24 | {\ButtonSelect} |
25 | & Select a jewel \\ | 25 | & Select a jewel \\ |
26 | \opt{RECORDER_PAD,IRIVER_H10_PAD}{Long \ButtonPlay}% | 26 | \opt{RECORDER_PAD,IRIVER_H10_PAD}{Long \ButtonPlay}% |
27 | \opt{ONDIO_PAD}{Long \ButtonMenu}% | 27 | \opt{ONDIO_PAD}{Long \ButtonMenu}% |
28 | \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}% | 28 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} or Long \ButtonSelect} |
29 | \opt{GIGABEAT_S_PAD}{\ButtonMenu{} or Long \ButtonSelect} | ||
30 | \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}% | ||
29 | {Long \ButtonSelect}% | 31 | {Long \ButtonSelect}% |
30 | \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{% start here because latex didn't like skipping the bottom row | ||
31 | & Show the in-game menu \\ | 32 | & Show the in-game menu \\ |
32 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}% | 33 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff & Exit \\}% |
33 | \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower}% | 34 | \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower & Exit \\}% |
34 | & Exit \\}% | 35 | |
35 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{% only finish this row for Ipods here | ||
36 | & Show the in-game menu \\}% | ||
37 | \end{btnmap} | 36 | \end{btnmap} |
38 | \end{table} | 37 | \end{table} |
39 | 38 | ||