diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-08-11 12:48:36 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-08-11 12:48:36 +0000 |
commit | d24ed9987b54c16fd73087cf01c27bafcf03dd1c (patch) | |
tree | f02b472300bc39fa499e1d5135499aa4f942d001 /apps/plugins | |
parent | ed70da26bd02ad50b9a7e4d1297cb4e7e43be6d4 (diff) | |
download | rockbox-d24ed9987b54c16fd73087cf01c27bafcf03dd1c.tar.gz rockbox-d24ed9987b54c16fd73087cf01c27bafcf03dd1c.zip |
'no voice' is -1 not 0 and menu_items does have a pointer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10527 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/jpeg.c | 28 | ||||
-rw-r--r-- | apps/plugins/lib/playback_control.c | 14 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox.c | 42 | ||||
-rw-r--r-- | apps/plugins/rockboy/menu.c | 28 | ||||
-rw-r--r-- | apps/plugins/wormlet.c | 298 |
5 files changed, 205 insertions, 205 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 5e221fea98..dfc198605d 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -2097,22 +2097,22 @@ int show_menu(void) /* return 1 to quit */ | |||
2097 | { "Return", NULL }, | 2097 | { "Return", NULL }, |
2098 | }; | 2098 | }; |
2099 | static const struct opt_items slideshow[2] = { | 2099 | static const struct opt_items slideshow[2] = { |
2100 | {"Disable",0}, | 2100 | { "Disable", -1 }, |
2101 | {"Enable",0}, | 2101 | { "Enable", -1 }, |
2102 | }; | 2102 | }; |
2103 | static const struct opt_items timeout[12] = { | 2103 | static const struct opt_items timeout[12] = { |
2104 | { "1 second", 0 }, | 2104 | { "1 second", -1 }, |
2105 | { "2 seconds", 0 }, | 2105 | { "2 seconds", -1 }, |
2106 | { "3 seconds", 0 }, | 2106 | { "3 seconds", -1 }, |
2107 | { "4 seconds", 0 }, | 2107 | { "4 seconds", -1 }, |
2108 | { "5 seconds", 0 }, | 2108 | { "5 seconds", -1 }, |
2109 | { "6 seconds", 0 }, | 2109 | { "6 seconds", -1 }, |
2110 | { "7 seconds", 0 }, | 2110 | { "7 seconds", -1 }, |
2111 | { "8 seconds", 0 }, | 2111 | { "8 seconds", -1 }, |
2112 | { "9 seconds", 0 }, | 2112 | { "9 seconds", -1 }, |
2113 | { "10 seconds", 0 }, | 2113 | { "10 seconds", -1 }, |
2114 | { "15 seconds", 0 }, | 2114 | { "15 seconds", -1 }, |
2115 | { "20 seconds", 0 }, | 2115 | { "20 seconds", -1 }, |
2116 | }; | 2116 | }; |
2117 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 2117 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |
2118 | NULL, NULL, NULL, NULL); | 2118 | NULL, NULL, NULL, NULL); |
diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c index 35a2b92b51..1638a0f663 100644 --- a/apps/plugins/lib/playback_control.c +++ b/apps/plugins/lib/playback_control.c | |||
@@ -57,8 +57,8 @@ static bool volume(void) | |||
57 | static bool shuffle(void) | 57 | static bool shuffle(void) |
58 | { | 58 | { |
59 | struct opt_items names[] = { | 59 | struct opt_items names[] = { |
60 | {"No", 0}, | 60 | { "No", -1 }, |
61 | {"Yes", 0} | 61 | { "Yes", -1 } |
62 | }; | 62 | }; |
63 | return api->set_option("Shuffle", &api->global_settings->playlist_shuffle, | 63 | return api->set_option("Shuffle", &api->global_settings->playlist_shuffle, |
64 | BOOL, names, 2,NULL); | 64 | BOOL, names, 2,NULL); |
@@ -68,12 +68,12 @@ static bool repeat_mode(void) | |||
68 | { | 68 | { |
69 | bool result; | 69 | bool result; |
70 | static const struct opt_items names[] = { | 70 | static const struct opt_items names[] = { |
71 | { "Off", 0 }, | 71 | { "Off", -1 }, |
72 | { "Repeat All", 0 }, | 72 | { "Repeat All", -1 }, |
73 | { "Repeat One", 0 }, | 73 | { "Repeat One", -1 }, |
74 | { "Repeat Shuffle", 0 }, | 74 | { "Repeat Shuffle", -1 }, |
75 | #ifdef AB_REPEAT_ENABLE | 75 | #ifdef AB_REPEAT_ENABLE |
76 | { "Repeat A-B", 0 } | 76 | { "Repeat A-B", -1 } |
77 | #endif | 77 | #endif |
78 | }; | 78 | }; |
79 | 79 | ||
diff --git a/apps/plugins/pacbox/pacbox.c b/apps/plugins/pacbox/pacbox.c index d7a0becdd0..8acc06ae1d 100644 --- a/apps/plugins/pacbox/pacbox.c +++ b/apps/plugins/pacbox/pacbox.c | |||
@@ -147,42 +147,42 @@ static bool pacbox_menu(void) | |||
147 | bool need_restart = false; | 147 | bool need_restart = false; |
148 | 148 | ||
149 | static const struct opt_items noyes[2] = { | 149 | static const struct opt_items noyes[2] = { |
150 | { "No", 0 }, | 150 | { "No", -1 }, |
151 | { "Yes", 0 }, | 151 | { "Yes", -1 }, |
152 | }; | 152 | }; |
153 | 153 | ||
154 | static const struct opt_items difficulty_options[2] = { | 154 | static const struct opt_items difficulty_options[2] = { |
155 | { "Normal", 0 }, | 155 | { "Normal", -1 }, |
156 | { "Harder", 0 }, | 156 | { "Harder", -1 }, |
157 | }; | 157 | }; |
158 | 158 | ||
159 | static const struct opt_items numlives_options[4] = { | 159 | static const struct opt_items numlives_options[4] = { |
160 | { "1", 0 }, | 160 | { "1", -1 }, |
161 | { "2", 0 }, | 161 | { "2", -1 }, |
162 | { "3", 0 }, | 162 | { "3", -1 }, |
163 | { "5", 0 }, | 163 | { "5", -1 }, |
164 | }; | 164 | }; |
165 | 165 | ||
166 | static const struct opt_items bonus_options[4] = { | 166 | static const struct opt_items bonus_options[4] = { |
167 | { "10000 points", 0 }, | 167 | { "10000 points", -1 }, |
168 | { "15000 points", 0 }, | 168 | { "15000 points", -1 }, |
169 | { "20000 points", 0 }, | 169 | { "20000 points", -1 }, |
170 | { "No bonus", 0 }, | 170 | { "No bonus", -1 }, |
171 | }; | 171 | }; |
172 | 172 | ||
173 | static const struct opt_items ghostname_options[2] = { | 173 | static const struct opt_items ghostname_options[2] = { |
174 | { "Normal", 0 }, | 174 | { "Normal", -1 }, |
175 | { "Alternate", 0 }, | 175 | { "Alternate", -1 }, |
176 | }; | 176 | }; |
177 | 177 | ||
178 | static const struct menu_item items[] = { | 178 | static const struct menu_item items[] = { |
179 | { "Difficulty", 0 }, | 179 | { "Difficulty", NULL }, |
180 | { "Pacmen Per Game", 0 }, | 180 | { "Pacmen Per Game", NULL }, |
181 | { "Bonus Life", 0 }, | 181 | { "Bonus Life", NULL }, |
182 | { "Ghost Names", 0 }, | 182 | { "Ghost Names", NULL }, |
183 | { "Display FPS", 0 }, | 183 | { "Display FPS", NULL }, |
184 | { "Restart", 0 }, | 184 | { "Restart", NULL }, |
185 | { "Quit", 0 }, | 185 | { "Quit", NULL }, |
186 | }; | 186 | }; |
187 | 187 | ||
188 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 188 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index c87799496a..8dffaa0f43 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -322,29 +322,29 @@ static void do_opt_menu(void) | |||
322 | int result; | 322 | int result; |
323 | 323 | ||
324 | static const struct opt_items onoff[2] = { | 324 | static const struct opt_items onoff[2] = { |
325 | { "Off", 0 }, | 325 | { "Off", -1 }, |
326 | { "On" , 0 }, | 326 | { "On" , -1 }, |
327 | }; | 327 | }; |
328 | 328 | ||
329 | static const struct opt_items fullscreen[]= { | 329 | static const struct opt_items fullscreen[]= { |
330 | { "Off", 0 }, | 330 | { "Off", -1 }, |
331 | { "Fullscreen", 0 }, | 331 | { "Fullscreen", -1 }, |
332 | { "Full - Maintain Ratio", 0 }, | 332 | { "Full - Maintain Ratio", -1 }, |
333 | }; | 333 | }; |
334 | 334 | ||
335 | static const struct opt_items frameskip[]= { | 335 | static const struct opt_items frameskip[]= { |
336 | { "3 Max", 0 }, | 336 | { "3 Max", -1 }, |
337 | { "4 Max", 0 }, | 337 | { "4 Max", -1 }, |
338 | { "5 Max", 0 }, | 338 | { "5 Max", -1 }, |
339 | { "6 Max", 0 }, | 339 | { "6 Max", -1 }, |
340 | }; | 340 | }; |
341 | 341 | ||
342 | static const struct menu_item items[] = { | 342 | static const struct menu_item items[] = { |
343 | {"Max Frameskip", 0 }, | 343 | { "Max Frameskip", NULL }, |
344 | {"Sound" , 0 }, | 344 | { "Sound" , NULL }, |
345 | {"Stats" , 0 }, | 345 | { "Stats" , NULL }, |
346 | {"Fullscreen" , 0 }, | 346 | { "Fullscreen" , NULL }, |
347 | {"Set Keys (Buggy)", 0 }, | 347 | { "Set Keys (Buggy)", NULL }, |
348 | }; | 348 | }; |
349 | 349 | ||
350 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); | 350 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), NULL, NULL, NULL, NULL); |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index b4469eafda..279fcfcb61 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -2103,9 +2103,9 @@ bool set_worm_num_worms(void) | |||
2103 | { | 2103 | { |
2104 | bool ret; | 2104 | bool ret; |
2105 | static const struct opt_items num_worms_option[3] = { | 2105 | static const struct opt_items num_worms_option[3] = { |
2106 | { "1", 0 }, | 2106 | { "1", -1 }, |
2107 | { "2", 0 }, | 2107 | { "2", -1 }, |
2108 | { "3", 0 }, | 2108 | { "3", -1 }, |
2109 | }; | 2109 | }; |
2110 | 2110 | ||
2111 | ret = rb->set_option("Number Of Worms", &worm_count,INT, num_worms_option, 3, NULL); | 2111 | ret = rb->set_option("Number Of Worms", &worm_count,INT, num_worms_option, 3, NULL); |
@@ -2122,10 +2122,10 @@ bool set_worm_num_players(void) | |||
2122 | { | 2122 | { |
2123 | bool ret; | 2123 | bool ret; |
2124 | static const struct opt_items num_players_option[4] = { | 2124 | static const struct opt_items num_players_option[4] = { |
2125 | { "0", 0 }, | 2125 | { "0", -1 }, |
2126 | { "1", 0 }, | 2126 | { "1", -1 }, |
2127 | { "2", 0 }, | 2127 | { "2", -1 }, |
2128 | { "3", 0 } | 2128 | { "3", -1 } |
2129 | }; | 2129 | }; |
2130 | 2130 | ||
2131 | ret = rb->set_option("Number of Players", &players, INT,num_players_option , 4, NULL); | 2131 | ret = rb->set_option("Number of Players", &players, INT,num_players_option , 4, NULL); |
@@ -2144,17 +2144,17 @@ Sets the size of each argh block created | |||
2144 | bool set_worm_argh_size(void) | 2144 | bool set_worm_argh_size(void) |
2145 | { | 2145 | { |
2146 | static const struct opt_items argh_size_option[11] = { | 2146 | static const struct opt_items argh_size_option[11] = { |
2147 | { "0", 0 }, | 2147 | { "0", -1 }, |
2148 | { "1", 0 }, | 2148 | { "1", -1 }, |
2149 | { "2", 0 }, | 2149 | { "2", -1 }, |
2150 | { "3", 0 }, | 2150 | { "3", -1 }, |
2151 | { "4", 0 }, | 2151 | { "4", -1 }, |
2152 | { "5", 0 }, | 2152 | { "5", -1 }, |
2153 | { "6", 0 }, | 2153 | { "6", -1 }, |
2154 | { "7", 0 }, | 2154 | { "7", -1 }, |
2155 | { "8", 0 }, | 2155 | { "8", -1 }, |
2156 | { "9", 0 }, | 2156 | { "9", -1 }, |
2157 | { "10", 0 } | 2157 | { "10", -1 } |
2158 | }; | 2158 | }; |
2159 | 2159 | ||
2160 | return rb->set_option("Argh Size", &argh_size,INT,argh_size_option , 11, NULL); | 2160 | return rb->set_option("Argh Size", &argh_size,INT,argh_size_option , 11, NULL); |
@@ -2166,17 +2166,17 @@ Sets the amount a worm grows per food | |||
2166 | bool set_worm_food(void) | 2166 | bool set_worm_food(void) |
2167 | { | 2167 | { |
2168 | static const struct opt_items worm_food_option[11] = { | 2168 | static const struct opt_items worm_food_option[11] = { |
2169 | { "0", 0 }, | 2169 | { "0", -1 }, |
2170 | { "1", 0 }, | 2170 | { "1", -1 }, |
2171 | { "2", 0 }, | 2171 | { "2", -1 }, |
2172 | { "3", 0 }, | 2172 | { "3", -1 }, |
2173 | { "4", 0 }, | 2173 | { "4", -1 }, |
2174 | { "5", 0 }, | 2174 | { "5", -1 }, |
2175 | { "6", 0 }, | 2175 | { "6", -1 }, |
2176 | { "7", 0 }, | 2176 | { "7", -1 }, |
2177 | { "8", 0 }, | 2177 | { "8", -1 }, |
2178 | { "9", 0 }, | 2178 | { "9", -1 }, |
2179 | { "10", 0 } | 2179 | { "10", -1 } |
2180 | }; | 2180 | }; |
2181 | return rb->set_option("Worm Growth Per Food", &worm_food,INT,worm_food_option , 11, NULL); | 2181 | return rb->set_option("Worm Growth Per Food", &worm_food,INT,worm_food_option , 11, NULL); |
2182 | } | 2182 | } |
@@ -2187,11 +2187,11 @@ Sets the number of arghs created per food | |||
2187 | bool set_argh_per_food(void) | 2187 | bool set_argh_per_food(void) |
2188 | { | 2188 | { |
2189 | static const struct opt_items argh_food_option[5] = { | 2189 | static const struct opt_items argh_food_option[5] = { |
2190 | { "0", 0 }, | 2190 | { "0", -1 }, |
2191 | { "1", 0 }, | 2191 | { "1", -1 }, |
2192 | { "2", 0 }, | 2192 | { "2", -1 }, |
2193 | { "3", 0 }, | 2193 | { "3", -1 }, |
2194 | { "4", 0 }, | 2194 | { "4", -1 }, |
2195 | }; | 2195 | }; |
2196 | return rb->set_option("Arghs Per Food", &arghs_per_food,INT,argh_food_option , 5, NULL); | 2196 | return rb->set_option("Arghs Per Food", &arghs_per_food,INT,argh_food_option , 5, NULL); |
2197 | } | 2197 | } |
@@ -2203,25 +2203,25 @@ bool set_worm_speed(void) | |||
2203 | { | 2203 | { |
2204 | bool ret; | 2204 | bool ret; |
2205 | static const struct opt_items speed_option[19] = { | 2205 | static const struct opt_items speed_option[19] = { |
2206 | { "0", 0 }, | 2206 | { "0", -1 }, |
2207 | { "1", 0 }, | 2207 | { "1", -1 }, |
2208 | { "2", 0 }, | 2208 | { "2", -1 }, |
2209 | { "3", 0 }, | 2209 | { "3", -1 }, |
2210 | { "4", 0 }, | 2210 | { "4", -1 }, |
2211 | { "5", 0 }, | 2211 | { "5", -1 }, |
2212 | { "6", 0 }, | 2212 | { "6", -1 }, |
2213 | { "7", 0 }, | 2213 | { "7", -1 }, |
2214 | { "8", 0 }, | 2214 | { "8", -1 }, |
2215 | { "9", 0 }, | 2215 | { "9", -1 }, |
2216 | { "10", 0 }, | 2216 | { "10", -1 }, |
2217 | { "11", 0 }, | 2217 | { "11", -1 }, |
2218 | { "12", 0 }, | 2218 | { "12", -1 }, |
2219 | { "13", 0 }, | 2219 | { "13", -1 }, |
2220 | { "14", 0 }, | 2220 | { "14", -1 }, |
2221 | { "15", 0 }, | 2221 | { "15", -1 }, |
2222 | { "16", 0 }, | 2222 | { "16", -1 }, |
2223 | { "17", 0 }, | 2223 | { "17", -1 }, |
2224 | { "18", 0 }, | 2224 | { "18", -1 }, |
2225 | }; | 2225 | }; |
2226 | 2226 | ||
2227 | 2227 | ||
@@ -2240,17 +2240,17 @@ bool set_bool_options(char* string, bool* variable, | |||
2240 | bool set_worm_control_style(void) | 2240 | bool set_worm_control_style(void) |
2241 | { | 2241 | { |
2242 | static const struct opt_items key1_option[2] = { | 2242 | static const struct opt_items key1_option[2] = { |
2243 | { "Remote Control", 0 }, | 2243 | { "Remote Control", -1 }, |
2244 | { "No Rem. Control", 0 }, | 2244 | { "No Rem. Control", -1 }, |
2245 | }; | 2245 | }; |
2246 | 2246 | ||
2247 | static const struct opt_items key2_option[2] = { | 2247 | static const struct opt_items key2_option[2] = { |
2248 | { "2 Key Control", 0 }, | 2248 | { "2 Key Control", -1 }, |
2249 | { "4 Key COntrol", 0 }, | 2249 | { "4 Key COntrol", -1 }, |
2250 | }; | 2250 | }; |
2251 | 2251 | ||
2252 | static const struct opt_items key3_option[1] = { | 2252 | static const struct opt_items key3_option[1] = { |
2253 | { "Out of Control", 0 }, | 2253 | { "Out of Control", -1 }, |
2254 | }; | 2254 | }; |
2255 | 2255 | ||
2256 | if (players > 1) { | 2256 | if (players > 1) { |
@@ -2352,14 +2352,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2352 | /* Setup screen */ | 2352 | /* Setup screen */ |
2353 | 2353 | ||
2354 | static const struct opt_items noyes[2] = { | 2354 | static const struct opt_items noyes[2] = { |
2355 | { "No", 0 }, | 2355 | { "No", -1 }, |
2356 | { "Yes", 0 }, | 2356 | { "Yes", -1 }, |
2357 | }; | 2357 | }; |
2358 | 2358 | ||
2359 | static const struct opt_items num_worms_option[3] = { | 2359 | static const struct opt_items num_worms_option[3] = { |
2360 | { "1", 0 }, | 2360 | { "1", -1 }, |
2361 | { "2", 0 }, | 2361 | { "2", -1 }, |
2362 | { "3", 0 } | 2362 | { "3", -1 } |
2363 | }; | 2363 | }; |
2364 | 2364 | ||
2365 | #ifdef MULTIPLAYER | 2365 | #ifdef MULTIPLAYER |
@@ -2367,129 +2367,129 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2367 | #else | 2367 | #else |
2368 | static const struct opt_items num_players_option[2] = { | 2368 | static const struct opt_items num_players_option[2] = { |
2369 | #endif | 2369 | #endif |
2370 | { "0", 0 }, | 2370 | { "0", -1 }, |
2371 | { "1", 0 } | 2371 | { "1", -1 } |
2372 | #ifdef MULTIPLAYER | 2372 | #ifdef MULTIPLAYER |
2373 | ,{ "2", 0 }, | 2373 | ,{ "2", -1 }, |
2374 | { "3", 0 } | 2374 | { "3", -1 } |
2375 | #endif | 2375 | #endif |
2376 | }; | 2376 | }; |
2377 | 2377 | ||
2378 | static const struct opt_items argh_size_option[9] = { | 2378 | static const struct opt_items argh_size_option[9] = { |
2379 | { "2", 0 }, | 2379 | { "2", -1 }, |
2380 | { "3", 0 }, | 2380 | { "3", -1 }, |
2381 | { "4", 0 }, | 2381 | { "4", -1 }, |
2382 | { "5", 0 }, | 2382 | { "5", -1 }, |
2383 | { "6", 0 }, | 2383 | { "6", -1 }, |
2384 | { "7", 0 }, | 2384 | { "7", -1 }, |
2385 | { "8", 0 }, | 2385 | { "8", -1 }, |
2386 | { "9", 0 }, | 2386 | { "9", -1 }, |
2387 | { "10", 0 } | 2387 | { "10", -1 } |
2388 | }; | 2388 | }; |
2389 | 2389 | ||
2390 | static const struct opt_items food_size_option[9] = { | 2390 | static const struct opt_items food_size_option[9] = { |
2391 | { "2", 0 }, | 2391 | { "2", -1 }, |
2392 | { "3", 0 }, | 2392 | { "3", -1 }, |
2393 | { "4", 0 }, | 2393 | { "4", -1 }, |
2394 | { "5", 0 }, | 2394 | { "5", -1 }, |
2395 | { "6", 0 }, | 2395 | { "6", -1 }, |
2396 | { "7", 0 }, | 2396 | { "7", -1 }, |
2397 | { "8", 0 }, | 2397 | { "8", -1 }, |
2398 | { "9", 0 }, | 2398 | { "9", -1 }, |
2399 | { "10", 0 } | 2399 | { "10", -1 } |
2400 | }; | 2400 | }; |
2401 | 2401 | ||
2402 | static const struct opt_items worm_food_option[16] = { | 2402 | static const struct opt_items worm_food_option[16] = { |
2403 | { "0", 0 }, | 2403 | { "0", -1 }, |
2404 | { "1", 0 }, | 2404 | { "1", -1 }, |
2405 | { "2", 0 }, | 2405 | { "2", -1 }, |
2406 | { "3", 0 }, | 2406 | { "3", -1 }, |
2407 | { "4", 0 }, | 2407 | { "4", -1 }, |
2408 | { "5", 0 }, | 2408 | { "5", -1 }, |
2409 | { "6", 0 }, | 2409 | { "6", -1 }, |
2410 | { "7", 0 }, | 2410 | { "7", -1 }, |
2411 | { "8", 0 }, | 2411 | { "8", -1 }, |
2412 | { "9", 0 }, | 2412 | { "9", -1 }, |
2413 | { "10", 0 }, | 2413 | { "10", -1 }, |
2414 | { "11", 0 }, | 2414 | { "11", -1 }, |
2415 | { "12", 0 }, | 2415 | { "12", -1 }, |
2416 | { "13", 0 }, | 2416 | { "13", -1 }, |
2417 | { "14", 0 }, | 2417 | { "14", -1 }, |
2418 | { "15", 0 } | 2418 | { "15", -1 } |
2419 | }; | 2419 | }; |
2420 | 2420 | ||
2421 | static const struct opt_items argh_food_option[9] = { | 2421 | static const struct opt_items argh_food_option[9] = { |
2422 | { "0", 0 }, | 2422 | { "0", -1 }, |
2423 | { "1", 0 }, | 2423 | { "1", -1 }, |
2424 | { "2", 0 }, | 2424 | { "2", -1 }, |
2425 | { "3", 0 }, | 2425 | { "3", -1 }, |
2426 | { "4", 0 }, | 2426 | { "4", -1 }, |
2427 | { "5", 0 }, | 2427 | { "5", -1 }, |
2428 | { "6", 0 }, | 2428 | { "6", -1 }, |
2429 | { "7", 0 }, | 2429 | { "7", -1 }, |
2430 | { "8", 0 } | 2430 | { "8", -1 } |
2431 | }; | 2431 | }; |
2432 | 2432 | ||
2433 | static const struct opt_items speed_option[21] = { | 2433 | static const struct opt_items speed_option[21] = { |
2434 | { "0", 0 }, | 2434 | { "0", -1 }, |
2435 | { "1", 0 }, | 2435 | { "1", -1 }, |
2436 | { "2", 0 }, | 2436 | { "2", -1 }, |
2437 | { "3", 0 }, | 2437 | { "3", -1 }, |
2438 | { "4", 0 }, | 2438 | { "4", -1 }, |
2439 | { "5", 0 }, | 2439 | { "5", -1 }, |
2440 | { "6", 0 }, | 2440 | { "6", -1 }, |
2441 | { "7", 0 }, | 2441 | { "7", -1 }, |
2442 | { "8", 0 }, | 2442 | { "8", -1 }, |
2443 | { "9", 0 }, | 2443 | { "9", -1 }, |
2444 | { "10", 0 }, | 2444 | { "10", -1 }, |
2445 | { "11", 0 }, | 2445 | { "11", -1 }, |
2446 | { "12", 0 }, | 2446 | { "12", -1 }, |
2447 | { "13", 0 }, | 2447 | { "13", -1 }, |
2448 | { "14", 0 }, | 2448 | { "14", -1 }, |
2449 | { "15", 0 }, | 2449 | { "15", -1 }, |
2450 | { "16", 0 }, | 2450 | { "16", -1 }, |
2451 | { "17", 0 }, | 2451 | { "17", -1 }, |
2452 | { "18", 0 }, | 2452 | { "18", -1 }, |
2453 | { "19", 0 }, | 2453 | { "19", -1 }, |
2454 | { "20", 0 } | 2454 | { "20", -1 } |
2455 | }; | 2455 | }; |
2456 | 2456 | ||
2457 | static const struct opt_items remoteonly_option[1] = { | 2457 | static const struct opt_items remoteonly_option[1] = { |
2458 | { "Remote Control", 0 } | 2458 | { "Remote Control", -1 } |
2459 | }; | 2459 | }; |
2460 | 2460 | ||
2461 | static const struct opt_items key24_option[2] = { | 2461 | static const struct opt_items key24_option[2] = { |
2462 | { "4 Key Control", 0 }, | 2462 | { "4 Key Control", -1 }, |
2463 | { "2 Key Control", 0 } | 2463 | { "2 Key Control", -1 } |
2464 | }; | 2464 | }; |
2465 | 2465 | ||
2466 | #ifdef REMOTE | 2466 | #ifdef REMOTE |
2467 | static const struct opt_items remote_option[2] = { | 2467 | static const struct opt_items remote_option[2] = { |
2468 | { "Remote Control", 0 }, | 2468 | { "Remote Control", -1 }, |
2469 | { "No Rem. Control", 0 } | 2469 | { "No Rem. Control", -1 } |
2470 | }; | 2470 | }; |
2471 | #else | 2471 | #else |
2472 | static const struct opt_items key2_option[1] = { | 2472 | static const struct opt_items key2_option[1] = { |
2473 | { "2 Key Control", 0 } | 2473 | { "2 Key Control", -1 } |
2474 | }; | 2474 | }; |
2475 | #endif | 2475 | #endif |
2476 | 2476 | ||
2477 | static const struct opt_items nokey_option[1] = { | 2477 | static const struct opt_items nokey_option[1] = { |
2478 | { "Out of Control", 0 } | 2478 | { "Out of Control", -1 } |
2479 | }; | 2479 | }; |
2480 | 2480 | ||
2481 | static const struct menu_item items[] = { | 2481 | static const struct menu_item items[] = { |
2482 | { "Play Wormlet!", 0 }, | 2482 | { "Play Wormlet!", NULL }, |
2483 | { "Number of Worms", 0 }, | 2483 | { "Number of Worms", NULL }, |
2484 | { "Number of Players", 0 }, | 2484 | { "Number of Players", NULL }, |
2485 | { "Control Style", 0 }, | 2485 | { "Control Style", NULL }, |
2486 | { "Worm Growth Per Food", 0 }, | 2486 | { "Worm Growth Per Food", NULL }, |
2487 | { "Worm Speed", 0 }, | 2487 | { "Worm Speed", NULL }, |
2488 | { "Arghs Per Food", 0 }, | 2488 | { "Arghs Per Food", NULL }, |
2489 | { "Argh Size", 0 }, | 2489 | { "Argh Size", NULL }, |
2490 | { "Food Size", 0 }, | 2490 | { "Food Size", NULL }, |
2491 | { "Revert to Default Settings", 0 }, | 2491 | { "Revert to Default Settings", NULL }, |
2492 | { "Quit", 0 } | 2492 | { "Quit", NULL } |
2493 | }; | 2493 | }; |
2494 | 2494 | ||
2495 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 2495 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |