diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/fireworks.c | 100 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi-gui.c | 14 | ||||
-rw-r--r-- | apps/plugins/test_sampr.c | 32 | ||||
-rw-r--r-- | apps/plugins/zxbox/spmain.c | 24 |
4 files changed, 85 insertions, 85 deletions
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index b95895342b..4ad487d242 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -140,60 +140,60 @@ LCD_RGBPACK(19,10,26) }; | |||
140 | #endif | 140 | #endif |
141 | 141 | ||
142 | static const struct opt_items autofire_delay_settings[15] = { | 142 | static const struct opt_items autofire_delay_settings[15] = { |
143 | { "Off", NULL }, | 143 | { "Off", -1 }, |
144 | { "50ms", NULL }, | 144 | { "50ms", -1 }, |
145 | { "100ms", NULL }, | 145 | { "100ms", -1 }, |
146 | { "200ms", NULL }, | 146 | { "200ms", -1 }, |
147 | { "300ms", NULL }, | 147 | { "300ms", -1 }, |
148 | { "400ms", NULL }, | 148 | { "400ms", -1 }, |
149 | { "500ms", NULL }, | 149 | { "500ms", -1 }, |
150 | { "600ms", NULL }, | 150 | { "600ms", -1 }, |
151 | { "700ms", NULL }, | 151 | { "700ms", -1 }, |
152 | { "800ms", NULL }, | 152 | { "800ms", -1 }, |
153 | { "900ms", NULL }, | 153 | { "900ms", -1 }, |
154 | { "1s", NULL }, | 154 | { "1s", -1 }, |
155 | { "2s", NULL }, | 155 | { "2s", -1 }, |
156 | { "3s", NULL }, | 156 | { "3s", -1 }, |
157 | { "4s", NULL } | 157 | { "4s", -1 } |
158 | }; | 158 | }; |
159 | 159 | ||
160 | int autofire_delay_values[15] = { | 160 | int autofire_delay_values[15] = { |
161 | 0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 200, 300, 400 }; | 161 | 0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 200, 300, 400 }; |
162 | 162 | ||
163 | static const struct opt_items particle_settings[8] = { | 163 | static const struct opt_items particle_settings[8] = { |
164 | { "5", NULL }, | 164 | { "5", -1 }, |
165 | { "10", NULL }, | 165 | { "10", -1 }, |
166 | { "15", NULL }, | 166 | { "15", -1 }, |
167 | { "20", NULL }, | 167 | { "20", -1 }, |
168 | { "25", NULL }, | 168 | { "25", -1 }, |
169 | { "30", NULL }, | 169 | { "30", -1 }, |
170 | { "35", NULL }, | 170 | { "35", -1 }, |
171 | { "40", NULL }, | 171 | { "40", -1 }, |
172 | }; | 172 | }; |
173 | 173 | ||
174 | int particle_values[8] = { | 174 | int particle_values[8] = { |
175 | 5, 10, 15, 20, 25, 30, 35, 40 }; | 175 | 5, 10, 15, 20, 25, 30, 35, 40 }; |
176 | 176 | ||
177 | static const struct opt_items particle_life_settings[9] = { | 177 | static const struct opt_items particle_life_settings[9] = { |
178 | { "20 cycles", NULL }, | 178 | { "20 cycles", -1 }, |
179 | { "30 cycles", NULL }, | 179 | { "30 cycles", -1 }, |
180 | { "40 cycles", NULL }, | 180 | { "40 cycles", -1 }, |
181 | { "50 cycles", NULL }, | 181 | { "50 cycles", -1 }, |
182 | { "60 cycles", NULL }, | 182 | { "60 cycles", -1 }, |
183 | { "70 cycles", NULL }, | 183 | { "70 cycles", -1 }, |
184 | { "80 cycles", NULL }, | 184 | { "80 cycles", -1 }, |
185 | { "90 cycles", NULL }, | 185 | { "90 cycles", -1 }, |
186 | { "100 cycles", NULL } | 186 | { "100 cycles", -1 } |
187 | }; | 187 | }; |
188 | 188 | ||
189 | int particle_life_values[9] = { | 189 | int particle_life_values[9] = { |
190 | 20, 30, 40, 50, 60, 70, 80, 90, 100 }; | 190 | 20, 30, 40, 50, 60, 70, 80, 90, 100 }; |
191 | 191 | ||
192 | static const struct opt_items gravity_settings[4] = { | 192 | static const struct opt_items gravity_settings[4] = { |
193 | { "Off", NULL }, | 193 | { "Off", -1 }, |
194 | { "Weak", NULL }, | 194 | { "Weak", -1 }, |
195 | { "Moderate", NULL }, | 195 | { "Moderate", -1 }, |
196 | { "Strong", NULL }, | 196 | { "Strong", -1 }, |
197 | }; | 197 | }; |
198 | 198 | ||
199 | int gravity_values[4] = { | 199 | int gravity_values[4] = { |
@@ -202,9 +202,9 @@ int gravity_values[4] = { | |||
202 | #ifdef HAVE_LCD_COLOR | 202 | #ifdef HAVE_LCD_COLOR |
203 | 203 | ||
204 | static const struct opt_items rocket_settings[3] = { | 204 | static const struct opt_items rocket_settings[3] = { |
205 | { "No", NULL }, | 205 | { "No", -1 }, |
206 | { "Yes (no trails)", NULL }, | 206 | { "Yes (no trails)", -1 }, |
207 | { "Yes (with trails)", NULL }, | 207 | { "Yes (with trails)", -1 }, |
208 | }; | 208 | }; |
209 | int rocket_values[4] = { | 209 | int rocket_values[4] = { |
210 | 2, 1, 0 }; | 210 | 2, 1, 0 }; |
@@ -212,8 +212,8 @@ int rocket_values[4] = { | |||
212 | #else | 212 | #else |
213 | 213 | ||
214 | static const struct opt_items rocket_settings[2] = { | 214 | static const struct opt_items rocket_settings[2] = { |
215 | { "No", NULL }, | 215 | { "No", -1 }, |
216 | { "Yes", NULL }, | 216 | { "Yes", -1 }, |
217 | }; | 217 | }; |
218 | int rocket_values[4] = { | 218 | int rocket_values[4] = { |
219 | 1, 0 }; | 219 | 1, 0 }; |
@@ -221,15 +221,15 @@ int rocket_values[4] = { | |||
221 | #endif | 221 | #endif |
222 | 222 | ||
223 | static const struct opt_items fps_settings[9] = { | 223 | static const struct opt_items fps_settings[9] = { |
224 | { "20 FPS", NULL }, | 224 | { "20 FPS", -1 }, |
225 | { "25 FPS", NULL }, | 225 | { "25 FPS", -1 }, |
226 | { "30 FPS", NULL }, | 226 | { "30 FPS", -1 }, |
227 | { "35 FPS", NULL }, | 227 | { "35 FPS", -1 }, |
228 | { "40 FPS", NULL }, | 228 | { "40 FPS", -1 }, |
229 | { "45 FPS", NULL }, | 229 | { "45 FPS", -1 }, |
230 | { "50 FPS", NULL }, | 230 | { "50 FPS", -1 }, |
231 | { "55 FPS", NULL }, | 231 | { "55 FPS", -1 }, |
232 | { "60 FPS", NULL } | 232 | { "60 FPS", -1 } |
233 | }; | 233 | }; |
234 | 234 | ||
235 | int fps_values[9] = { | 235 | int fps_values[9] = { |
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index f99f616668..6bfa4ae1af 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c | |||
@@ -322,9 +322,9 @@ static void reversi_gui_display_board(void) { | |||
322 | /* Menu entries and the corresponding values for cursor wrap mode */ | 322 | /* Menu entries and the corresponding values for cursor wrap mode */ |
323 | #define MENU_TEXT_WRAP_MODE "Cursor wrap mode" | 323 | #define MENU_TEXT_WRAP_MODE "Cursor wrap mode" |
324 | static const struct opt_items cursor_wrap_mode_settings[] = { | 324 | static const struct opt_items cursor_wrap_mode_settings[] = { |
325 | { "Flat board", NULL }, | 325 | { "Flat board", -1 }, |
326 | { "Sphere", NULL }, | 326 | { "Sphere", -1 }, |
327 | { "Torus", NULL }, | 327 | { "Torus", -1 }, |
328 | }; | 328 | }; |
329 | static const cursor_wrap_mode_t cursor_wrap_mode_values[3] = { | 329 | static const cursor_wrap_mode_t cursor_wrap_mode_values[3] = { |
330 | WRAP_FLAT, WRAP_SPHERE, WRAP_TORUS }; | 330 | WRAP_FLAT, WRAP_SPHERE, WRAP_TORUS }; |
@@ -335,10 +335,10 @@ static const cursor_wrap_mode_t cursor_wrap_mode_values[3] = { | |||
335 | #define MENU_TEXT_STRAT_BLACK "Strategy for black" | 335 | #define MENU_TEXT_STRAT_BLACK "Strategy for black" |
336 | 336 | ||
337 | static struct opt_items strategy_settings[] = { | 337 | static struct opt_items strategy_settings[] = { |
338 | { "Human", NULL }, | 338 | { "Human", -1 }, |
339 | { "Naive robot", NULL }, | 339 | { "Naive robot", -1 }, |
340 | { "Simple robot", NULL }, | 340 | { "Simple robot", -1 }, |
341 | //{ "AB robot", NULL }, | 341 | //{ "AB robot", -1 }, |
342 | }; | 342 | }; |
343 | static const game_strategy_t * const strategy_values[] = { | 343 | static const game_strategy_t * const strategy_values[] = { |
344 | &strategy_human, &strategy_naive, &strategy_simple, /*&strategy_ab*/ }; | 344 | &strategy_human, &strategy_naive, &strategy_simple, /*&strategy_ab*/ }; |
diff --git a/apps/plugins/test_sampr.c b/apps/plugins/test_sampr.c index d1c9c2ba71..2cd95d7983 100644 --- a/apps/plugins/test_sampr.c +++ b/apps/plugins/test_sampr.c | |||
@@ -138,18 +138,18 @@ void play_waveform(void) | |||
138 | { | 138 | { |
139 | static struct opt_items names[HW_NUM_FREQ] = | 139 | static struct opt_items names[HW_NUM_FREQ] = |
140 | { | 140 | { |
141 | HW_HAVE_96_([HW_FREQ_96] = { "96kHz", NULL },) | 141 | HW_HAVE_96_([HW_FREQ_96] = { "96kHz", -1 },) |
142 | HW_HAVE_88_([HW_FREQ_88] = { "88.2kHz", NULL },) | 142 | HW_HAVE_88_([HW_FREQ_88] = { "88.2kHz", -1 },) |
143 | HW_HAVE_64_([HW_FREQ_64] = { "64kHz", NULL },) | 143 | HW_HAVE_64_([HW_FREQ_64] = { "64kHz", -1 },) |
144 | HW_HAVE_48_([HW_FREQ_48] = { "48kHz", NULL },) | 144 | HW_HAVE_48_([HW_FREQ_48] = { "48kHz", -1 },) |
145 | HW_HAVE_44_([HW_FREQ_44] = { "44.1kHz", NULL },) | 145 | HW_HAVE_44_([HW_FREQ_44] = { "44.1kHz", -1 },) |
146 | HW_HAVE_32_([HW_FREQ_32] = { "32kHz", NULL },) | 146 | HW_HAVE_32_([HW_FREQ_32] = { "32kHz", -1 },) |
147 | HW_HAVE_24_([HW_FREQ_24] = { "24kHz", NULL },) | 147 | HW_HAVE_24_([HW_FREQ_24] = { "24kHz", -1 },) |
148 | HW_HAVE_22_([HW_FREQ_22] = { "22.05kHz", NULL },) | 148 | HW_HAVE_22_([HW_FREQ_22] = { "22.05kHz", -1 },) |
149 | HW_HAVE_16_([HW_FREQ_16] = { "16kHz", NULL },) | 149 | HW_HAVE_16_([HW_FREQ_16] = { "16kHz", -1 },) |
150 | HW_HAVE_12_([HW_FREQ_12] = { "12kHz", NULL },) | 150 | HW_HAVE_12_([HW_FREQ_12] = { "12kHz", -1 },) |
151 | HW_HAVE_11_([HW_FREQ_11] = { "11.025kHz", NULL },) | 151 | HW_HAVE_11_([HW_FREQ_11] = { "11.025kHz", -1 },) |
152 | HW_HAVE_8_( [HW_FREQ_8 ] = { "8kHz", NULL },) | 152 | HW_HAVE_8_( [HW_FREQ_8 ] = { "8kHz", -1 },) |
153 | }; | 153 | }; |
154 | 154 | ||
155 | /* 50 cycles of wavform */ | 155 | /* 50 cycles of wavform */ |
@@ -241,10 +241,10 @@ void set_waveform(void) | |||
241 | { | 241 | { |
242 | static struct opt_items names[NUM_WAVEFORMS] = | 242 | static struct opt_items names[NUM_WAVEFORMS] = |
243 | { | 243 | { |
244 | [TONE_SINE] = { "Sine", NULL }, | 244 | [TONE_SINE] = { "Sine", -1 }, |
245 | [TONE_TRIANGLE] = { "Triangle", NULL }, | 245 | [TONE_TRIANGLE] = { "Triangle", -1 }, |
246 | [TONE_SAWTOOTH] = { "Sawtooth", NULL }, | 246 | [TONE_SAWTOOTH] = { "Sawtooth", -1 }, |
247 | [TONE_SQUARE] = { "Square", NULL }, | 247 | [TONE_SQUARE] = { "Square", -1 }, |
248 | }; | 248 | }; |
249 | 249 | ||
250 | rb->set_option("Waveform", &waveform, INT, names, | 250 | rb->set_option("Waveform", &waveform, INT, names, |
diff --git a/apps/plugins/zxbox/spmain.c b/apps/plugins/zxbox/spmain.c index 3f0bc9319e..ca0fa9bc71 100644 --- a/apps/plugins/zxbox/spmain.c +++ b/apps/plugins/zxbox/spmain.c | |||
@@ -237,8 +237,8 @@ static void select_keymap(void){ | |||
237 | /* options menu */ | 237 | /* options menu */ |
238 | static void options_menu(void){ | 238 | static void options_menu(void){ |
239 | static const struct opt_items no_yes[2] = { | 239 | static const struct opt_items no_yes[2] = { |
240 | { "No", NULL }, | 240 | { "No", -1 }, |
241 | { "Yes", NULL }, | 241 | { "Yes", -1 }, |
242 | }; | 242 | }; |
243 | int m; | 243 | int m; |
244 | int result; | 244 | int result; |
@@ -255,16 +255,16 @@ static void options_menu(void){ | |||
255 | { "Custom keymap", NULL }, | 255 | { "Custom keymap", NULL }, |
256 | }; | 256 | }; |
257 | static struct opt_items frameskip_items[] = { | 257 | static struct opt_items frameskip_items[] = { |
258 | { "0", NULL }, | 258 | { "0", -1 }, |
259 | { "1", NULL }, | 259 | { "1", -1 }, |
260 | { "2", NULL }, | 260 | { "2", -1 }, |
261 | { "3", NULL }, | 261 | { "3", -1 }, |
262 | { "4", NULL }, | 262 | { "4", -1 }, |
263 | { "5", NULL }, | 263 | { "5", -1 }, |
264 | { "6", NULL }, | 264 | { "6", -1 }, |
265 | { "7", NULL }, | 265 | { "7", -1 }, |
266 | { "8", NULL }, | 266 | { "8", -1 }, |
267 | { "9", NULL }, | 267 | { "9", -1 }, |
268 | }; | 268 | }; |
269 | 269 | ||
270 | 270 | ||