Navigation

← Previous Changeset
Next Changeset →

Changeset 464

Timestamp:

08/07/07 19:13:21 (1 year ago)

Author:

takkaria

Message:

Replace the three seperate options lists with one numbered list containing all the previous info. Goes over 80 chars
wide, but it's worth it, because it makes editing much much easier. (followup to [463])

Files:

trunk/src/option.c (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/option.c

r463	r464
121	121
122	122
123		/*
124		* Options -- textual names (where defined)
125		*/
126		static const char *names[OPT_MAX] =
127		{
128		"rogue_like_commands", /* OPT_rogue_like_commands */
129		"quick_messages", /* OPT_quick_messages */
130		"use_sound", /* OPT_use_sound */
131		"pickup_detail", /* OPT_pickup_detail */
132		"use_old_target", /* OPT_use_old_target */
133		"pickup_always", /* OPT_pickup_always */
134		"pickup_inven", /* OPT_pickup_inven */
135		"depth_in_feet", /* OPT_depth_in_feet */
136		NULL, /* xxx stack_force_notes */
137		NULL, /* xxx stack_force_costs */
138		"show_labels", /* OPT_show_labels */
139		"show_lists", /* OPT_show_lists */
140		NULL, /* xxx show_choices */
141		NULL, /* xxx show_details */
142		"ring_bell", /* OPT_ring_bell */
143		"show_flavors", /* OPT_flavors */
144		NULL, /* xxx run_ignore_stairs */
145		NULL, /* xxx run_ignore_doors */
146		NULL, /* xxx run_cut_corners */
147		NULL, /* xxx run_use_corners */
148		"disturb_move", /* OPT_disturb_move */
149		"disturb_near", /* OPT_disturb_near */
150		"disturb_detect", /* OPT_disturb_detect */
151		"disturb_state", /* OPT_disturb_state */
152		"disturb_minor", /* OPT_disturb_minor */
153		NULL, /* xxx next_xp */
154		NULL, /* xxx alert_hitpoint */
155		NULL, /* xxx alert_failure */
156		NULL, /* xxx verify_destroy */
157		NULL, /* xxx verify_special */
158		NULL, /* xxx allow_quantity */
159		NULL, /* xxx */
160		NULL, /* xxx auto_haggle */
161		NULL, /* xxx auto_scum */
162		NULL, /* xxx testing_stack */
163		NULL, /* xxx testing_carry */
164		NULL, /* xxx expand_look */
165		NULL, /* xxx expand_list */
166		"view_perma_grids", /* OPT_view_perma_grids */
167		"view_torch_grids", /* OPT_view_torch_grids */
168		NULL, /* xxx dungeon_align */
169		NULL, /* xxx dungeon_stair */
170		NULL, /* xxx flow_by_sound */
171		NULL, /* xxx flow_by_smell */
172		NULL, /* xxx track_follow */
173		NULL, /* xxx track_target */
174		NULL, /* xxx smart_learn */
175		NULL, /* xxx smart_cheat */
176		NULL, /* xxx view_reduce_lite */
177		NULL, /* xxx hidden_player */
178		NULL, /* xxx avoid_abort */
179		NULL, /* xxx avoid_other */
180		"flush_failure", /* OPT_flush_failure */
181		"flush_disturb", /* OPT_flush_disturb */
182		NULL, /* xxx flush_command */
183		NULL, /* xxx fresh_before */
184		NULL, /* xxx fresh_after */
185		NULL, /* xxx fresh_message */
186		NULL, /* xxx compress_savefile */
187		"hilite_player", /* OPT_hilite_player */
188		"view_yellow_lite", /* OPT_view_yellow_lite */
189		"view_bright_lite", /* OPT_view_bright_lite */
190		"view_granite_lite", /* OPT_view_granite_lite */
191		"view_special_lite", /* OPT_view_special_lite */
192		"easy_open", /* OPT_easy_open */
193		"easy_alter", /* OPT_easy_alter */
194		NULL, /* xxx easy_floor */
195		"show_piles", /* OPT_show_piles */
196		"center_player", /* OPT_center_player */
197		NULL, /* xxx run_avoid_center */
198		NULL, /* xxx scroll_target */
199		"auto_more", /* OPT_auto_more */
200		NULL, /* xxx smart_monsters */
201		NULL, /* xxx smart_packs */
202		"hp_changes_color", /* OPT_hp_changes_color */
203		"hide_squelchable", /* OPT_hide_squelchable */
204		"squelch_worthless", /* OPT_squelch_worthless */
205		"mouse_movement", /* OPT_mouse_movement */
206		NULL, /* xxx */
207		NULL, /* xxx */
208		NULL, /* xxx */
209		NULL, /* xxx */
210		NULL, /* xxx */
211		NULL, /* xxx */
212		NULL, /* xxx */
213		NULL, /* xxx */
214		NULL, /* xxx */
215		NULL, /* xxx */
216		NULL, /* xxx */
217		NULL, /* xxx */
218		NULL, /* xxx */
219		NULL, /* xxx */
220		NULL, /* xxx */
221		NULL, /* xxx */
222		NULL, /* xxx */
223		NULL, /* xxx */
224		NULL, /* xxx */
225		NULL, /* xxx */
226		NULL, /* xxx */
227		NULL, /* xxx */
228		NULL, /* xxx */
229		NULL, /* xxx */
230		NULL, /* xxx */
231		NULL, /* xxx */
232		NULL, /* xxx */
233		NULL, /* xxx */
234		NULL, /* xxx */
235		NULL, /* xxx */
236		NULL, /* xxx */
237		NULL, /* xxx */
238		NULL, /* xxx */
239		NULL, /* xxx */
240		NULL, /* xxx */
241		NULL, /* xxx */
242		NULL, /* xxx */
243		NULL, /* xxx */
244		NULL, /* xxx */
245		NULL, /* xxx */
246		NULL, /* xxx */
247		NULL, /* xxx */
248		NULL, /* xxx */
249		NULL, /* xxx */
250		NULL, /* xxx */
251		NULL, /* xxx */
252		NULL, /* xxx */
253		NULL, /* xxx */
254		NULL, /* xxx */
255		NULL, /* xxx */
256		"birth_maximize",
257		"birth_randarts",
258		"birth_autoscum",
259		"birth_ironman",
260		"birth_no_stores",
261		"birth_no_artifacts",
262		"birth_no_stacking",
263		"birth_no_preserve",
264		"birth_no_stairs",
265		NULL, /* xxx */
266		NULL, /* xxx */
267		NULL, /* xxx */
268		NULL, /* xxx */
269		"birth_ai_sound",
270		"birth_ai_smell",
271		"birth_ai_packs",
272		"birth_ai_learn",
273		"birth_ai_cheat",
274		"birth_ai_smart",
275		NULL, /* xxx */
276		NULL, /* xxx */
277		NULL, /* xxx */
278		NULL, /* xxx */
279		NULL, /* xxx */
280		NULL, /* xxx */
281		NULL, /* xxx */
282		NULL, /* xxx */
283		NULL, /* xxx */
284		NULL, /* xxx */
285		NULL, /* xxx */
286		NULL, /* xxx */
287		NULL, /* xxx */
288		"cheat_peek", /* OPT_cheat_peek */
289		"cheat_hear", /* OPT_cheat_hear */
290		"cheat_room", /* OPT_cheat_room */
291		"cheat_xtra", /* OPT_cheat_xtra */
292		"cheat_know", /* OPT_cheat_know */
293		"cheat_live", /* OPT_cheat_live */
294		NULL, /* xxx */
295		NULL, /* xxx */
296		NULL, /* xxx */
297		NULL, /* xxx */
298		NULL, /* xxx */
299		NULL, /* xxx */
300		NULL, /* xxx */
301		NULL, /* xxx */
302		NULL, /* xxx */
303		NULL, /* xxx */
304		NULL, /* xxx */
305		NULL, /* xxx */
306		NULL, /* xxx */
307		NULL, /* xxx */
308		NULL, /* xxx */
309		NULL, /* xxx */
310		NULL, /* xxx */
311		NULL, /* xxx */
312		NULL, /* xxx */
313		NULL, /* xxx */
314		NULL, /* xxx */
315		NULL, /* xxx */
316		NULL, /* xxx */
317		NULL, /* xxx */
318		NULL, /* xxx */
319		NULL, /* xxx */
320		"adult_maximize",
321		"adult_randarts",
322		"adult_autoscum",
323		"adult_ironman",
324		"adult_no_stores",
325		"adult_no_artifacts",
326		"adult_no_stacking",
327		"adult_no_preserve",
328		"adult_no_stairs",
329		NULL, /* xxx */
330		NULL, /* xxx */
331		NULL, /* xxx */
332		NULL, /* xxx */
333		"adult_ai_sound",
334		"adult_ai_smell",
335		"adult_ai_packs",
336		"adult_ai_learn",
337		"adult_ai_cheat",
338		"adult_ai_smart",
339		NULL, /* xxx */
340		NULL, /* xxx */
341		NULL, /* xxx */
342		NULL, /* xxx */
343		NULL, /* xxx */
344		NULL, /* xxx */
345		NULL, /* xxx */
346		NULL, /* xxx */
347		NULL, /* xxx */
348		NULL, /* xxx */
349		NULL, /* xxx */
350		NULL, /* xxx */
351		NULL, /* xxx */
352		"score_peek", /* OPT_score_peek */
353		"score_hear", /* OPT_score_hear */
354		"score_room", /* OPT_score_room */
355		"score_xtra", /* OPT_score_xtra */
356		"score_know", /* OPT_score_know */
357		"score_live", /* OPT_score_live */
358		NULL, /* xxx */
359		NULL, /* xxx */
360		NULL, /* xxx */
361		NULL, /* xxx */
362		NULL, /* xxx */
363		NULL, /* xxx */
364		NULL, /* xxx */
365		NULL, /* xxx */
366		NULL, /* xxx */
367		NULL, /* xxx */
368		NULL, /* xxx */
369		NULL, /* xxx */
370		NULL, /* xxx */
371		NULL, /* xxx */
372		NULL, /* xxx */
373		NULL, /* xxx */
374		NULL, /* xxx */
375		NULL, /* xxx */
376		NULL, /* xxx */
377		NULL, /* xxx */
378		NULL, /* xxx */
379		NULL, /* xxx */
380		NULL, /* xxx */
381		NULL, /* xxx */
382		NULL, /* xxx */
383		NULL /* xxx */
384		};
385
386
387		/*
388		* Options -- descriptions (where defined)
389		*/
390		static const char *descs[OPT_MAX] =
391		{
392		"Rogue-like commands", /* OPT_rogue_like_commands */
393		"Activate quick messages", /* OPT_quick_messages */
394		"Use sound", /* OPT_use_sound */
395		"Be verbose when picking things up", /* OPT_pickup_detail */
396		"Use old target by default", /* OPT_use_old_target */
397		"Always pickup items", /* OPT_pickup_always */
398		"Always pickup items matching inventory", /* OPT_pickup_inven */
399		"Show dungeon level in feet", /* OPT_depth_in_feet */
400		NULL, /* xxx stack_force_notes */
401		NULL, /* xxx stack_force_costs */
402		"Show labels in equipment listings", /* OPT_show_labels */
403		"Always show lists", /* OPT_show_lists */
404		NULL, /* xxx show_choices */
405		NULL, /* xxx show_details */
406		"Audible bell (on errors, etc)", /* OPT_ring_bell */
407		"Show flavors in object descriptions", /* OPT_show_flavors */
408		NULL, /* xxx run_ignore_stairs */
409		NULL, /* xxx run_ignore_doors */
410		NULL, /* xxx run_cut_corners */
411		NULL, /* xxx run_use_corners */
412		"Disturb whenever any monster moves", /* OPT_disturb_move */
413		"Disturb whenever viewable monster moves", /* OPT_disturb_near */
414		"Disturb whenever leaving trap detected area", /* OPT_disturb_detect */
415		"Disturb whenever player state changes", /* OPT_disturb_state */
416		"Disturb whenever boring things happen", /* OPT_disturb_minor */
417		NULL, /* xxx next_xp */
418		NULL, /* xxx alert_hitpoint */
419		NULL, /* xxx alert_failure */
420		NULL, /* xxx verify_destroy */
421		NULL, /* xxx verify_special */
422		NULL, /* xxx allow_quantity */
423		NULL, /* xxx */
424		NULL, /* xxx auto_haggle */
425		NULL, /* xxx auto_scum */
426		NULL, /* xxx testing_stack */
427		NULL, /* xxx testing_carry */
428		NULL, /* xxx expand_look */
429		NULL, /* xxx expand_list */
430		"Map remembers all perma-lit grids", /* OPT_view_perma_grids */
431		"Map remembers all torch-lit grids", /* OPT_view_torch_grids */
432		"Generate dungeons with aligned rooms", /* OPT_dungeon_align */
433		"Generate dungeons with connected stairs", /* OPT_dungeon_stair */
434		"Monsters chase current location (slow)", /* OPT_adult_ai_sound */
435		"Monsters chase recent locations (slow)", /* OPT_adult_ai_smell */
436		NULL, /* xxx track_follow */
437		NULL, /* xxx track_target */
438		NULL, /* xxx smart_learn */
439		NULL, /* xxx smart_cheat */
440		NULL, /* xxx view_reduce_lite */
441		NULL, /* xxx hidden_player */
442		NULL, /* xxx avoid_abort */
443		NULL, /* xxx avoid_other */
444		"Flush input on various failures", /* OPT_flush_failure */
445		"Flush input whenever disturbed", /* OPT_flush_disturb */
446		NULL, /* xxx */
447		NULL, /* xxx fresh_before */
448		NULL, /* xxx fresh_after */
449		NULL, /* xxx */
450		NULL, /* xxx compress_savefile */
451		"Hilite the player with the cursor", /* OPT_hilite_player */
452		"Use special colors for torch lite", /* OPT_view_yellow_lite */
453		"Use special colors for field of view", /* OPT_view_bright_lite */
454		"Use special colors for wall grids", /* OPT_view_granite_lite */
455		"Use special colors for floor grids", /* OPT_view_special_lite */
456		"Open/Disarm/Close without direction", /* OPT_easy_open */
457		"Open/Disarm doors/traps on movement", /* OPT_easy_alter */
458		NULL, /* xxx easy_floor */
459		"Show stacks using special attr/char", /* OPT_show_piles */
460		"Center map continuously", /* OPT_center_player */
461		NULL, /* xxx run_avoid_center */
462		NULL, /* xxx scroll_target */
463		"Automatically clear '-more-' prompts", /* OPT_auto_more */
464		NULL, /* xxx smart_monsters */
465		NULL, /* xxx smart_packs */
466		"Player color indicates low hit points", /* OPT_hp_changes_color */
467		"Hide items set as squelchable", /* OPT_hide_squelchable */
468		"Automatically squelch worthless items", /* OPT_squelch_worthless */
469		"Allow mouse clicks to move the player", /* OPT_mouse_movement */
470		NULL, /* xxx */
471		NULL, /* xxx */
472		NULL, /* xxx */
473		NULL, /* xxx */
474		NULL, /* xxx */
475		NULL, /* xxx */
476		NULL, /* xxx */
477		NULL, /* xxx */
478		NULL, /* xxx */
479		NULL, /* xxx */
480		NULL, /* xxx */
481		NULL, /* xxx */
482		NULL, /* xxx */
483		NULL, /* xxx */
484		NULL, /* xxx */
485		NULL, /* xxx */
486		NULL, /* xxx */
487		NULL, /* xxx */
488		NULL, /* xxx */
489		NULL, /* xxx */
490		NULL, /* xxx */
491		NULL, /* xxx */
492		NULL, /* xxx */
493		NULL, /* xxx */
494		NULL, /* xxx */
495		NULL, /* xxx */
496		NULL, /* xxx */
497		NULL, /* xxx */
498		NULL, /* xxx */
499		NULL, /* xxx */
500		NULL, /* xxx */
501		NULL, /* xxx */
502		NULL, /* xxx */
503		NULL, /* xxx */
504		NULL, /* xxx */
505		NULL, /* xxx */
506		NULL, /* xxx */
507		NULL, /* xxx */
508		NULL, /* xxx */
509		NULL, /* xxx */
510		NULL, /* xxx */
511		NULL, /* xxx */
512		NULL, /* xxx */
513		NULL, /* xxx */
514		NULL, /* xxx */
515		NULL, /* xxx */
516		NULL, /* xxx */
517		NULL, /* xxx */
518		NULL, /* xxx */
519		NULL, /* xxx */
520		"Maximize effect of race/class bonuses", /* OPT_birth_maximize */
521		"Randomize some of the artifacts (alpha)", /* OPT_birth_randarts */
522		"Auto-scum for good levels", /* OPT_birth_autoscum */
523		"Restrict the use of stairs/recall", /* OPT_birth_ironman */
524		"Restrict the use of stores/home", /* OPT_birth_no_stores */
525		"Restrict creation of artifacts", /* OPT_birth_no_artifacts */
526		"Don't stack objects on the floor", /* OPT_birth_no_stacking */
527		"Don't preserve artifacts when leaving level", /* OPT_birth_no_preserve */
528		"Don't generate connected stairs", /* OPT_birth_no_stairs */
529		NULL, /* xxx */
530		NULL, /* xxx */
531		NULL, /* xxx */
532		NULL, /* xxx */
533		"Monsters chase current location",
534		"Monsters chase recent locations",
535		"Monsters act smarter in groups",
536		"Monsters learn from their mistakes",
537		"Monsters exploit player's weaknesses",
538		"Monsters behave more intelligently (broken)",
539		NULL, /* xxx */
540		NULL, /* xxx */
541		NULL, /* xxx */
542		NULL, /* xxx */
543		NULL, /* xxx */
544		NULL, /* xxx */
545		NULL, /* xxx */
546		NULL, /* xxx */
547		NULL, /* xxx */
548		NULL, /* xxx */
549		NULL, /* xxx */
550		NULL, /* xxx */
551		NULL, /* xxx */
552		"Cheat: Peek into object creation", /* OPT_cheat_peek */
553		"Cheat: Peek into monster creation", /* OPT_cheat_hear */
554		"Cheat: Peek into dungeon creation", /* OPT_cheat_room */
555		"Cheat: Peek into something else", /* OPT_cheat_xtra */
556		"Cheat: Know complete monster info", /* OPT_cheat_know */
557		"Cheat: Allow player to avoid death", /* OPT_cheat_live */
558		NULL, /* xxx */
559		NULL, /* xxx */
560		NULL, /* xxx */
561		NULL, /* xxx */
562		NULL, /* xxx */
563		NULL, /* xxx */
564		NULL, /* xxx */
565		NULL, /* xxx */
566		NULL, /* xxx */
567		NULL, /* xxx */
568		NULL, /* xxx */
569		NULL, /* xxx */
570		NULL, /* xxx */
571		NULL, /* xxx */
572		NULL, /* xxx */
573		NULL, /* xxx */
574		NULL, /* xxx */
575		NULL, /* xxx */
576		NULL, /* xxx */
577		NULL, /* xxx */
578		NULL, /* xxx */
579		NULL, /* xxx */
580		NULL, /* xxx */
581		NULL, /* xxx */
582		NULL, /* xxx */
583		NULL, /* xxx */
584		"Adult: Maximize effect of race/class bonuses", /* OPT_adult_maximize */
585		"Adult: Randomize some of the artifacts (beta)",/* OPT_adult_randarts */
586		"Adult: Auto-scum for good levels", /* OPT_adult_autoscum */
587		"Adult: Restrict the use of stairs/recall", /* OPT_adult_ironman */
588		"Adult: Restrict the use of stores/home", /* OPT_adult_no_stores */
589		"Adult: Restrict creation of artifacts", /* OPT_adult_no_artifacts */
590		"Adult: Don't stack objects on the floor", /* OPT_adult_no_stacking */
591		"Adult: Preserve artifacts when leaving level", /* OPT_adult_no_preserve */
592		"Adult: Don't generate connected stairs", /* OPT_adult_no_stairs */
593		NULL, /* xxx */
594		NULL, /* xxx */
595		NULL, &n