diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-06-26 20:44:17 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-06-26 20:44:17 +0200 |
| commit | 07339db486c538b44b7c9488943dfb34c2ae24e4 (patch) | |
| tree | 222f25855a9c13cf04037f0650061112aa38735c /src | |
| parent | 799070362567a091cee65a0a1c1b616675e13a1d (diff) | |
Remove "show_choices" option
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd5.c | 24 | ||||
| -rw-r--r-- | src/object1.c | 2 | ||||
| -rw-r--r-- | src/tables.c | 3 | ||||
| -rw-r--r-- | src/variable.c | 1 |
4 files changed, 4 insertions, 26 deletions
@@ -2204,11 +2204,7 @@ s32b get_school_spell(cptr do_what, s16b force_book) flag = FALSE; /* Show choices */ - if (show_choices) - { - /* Window stuff */ - window_stuff(); - } + window_stuff(); /* No spell to cast by default */ spell = -1; @@ -2332,11 +2328,7 @@ s32b get_school_spell(cptr do_what, s16b force_book) /* Show choices */ - if (show_choices) - { - /* Window stuff */ - window_stuff(); - } + window_stuff(); /* Abort if needed */ @@ -2383,11 +2375,7 @@ void browse_school_spell(int book, int pval, object_type *o_ptr) char out_val[160]; /* Show choices */ - if (show_choices) - { - /* Window stuff */ - window_stuff(); - } + window_stuff(); num = school_book_length(book); @@ -2438,11 +2426,7 @@ void browse_school_spell(int book, int pval, object_type *o_ptr) character_icky = FALSE; /* Show choices */ - if (show_choices) - { - /* Window stuff */ - window_stuff(); - } + window_stuff(); } /* Can it contains a schooled spell ? */ diff --git a/src/object1.c b/src/object1.c index fd9ead08..8cec49d8 100644 --- a/src/object1.c +++ b/src/object1.c @@ -5428,7 +5428,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode) while (!done) { /* Show choices */ - if (show_choices) { int ni = 0; int ne = 0; @@ -5911,7 +5910,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode) } /* Clean up */ - if (show_choices) { /* Toggle again if needed */ if (toggle) toggle_inven_equip(); diff --git a/src/tables.c b/src/tables.c index 74bd66f2..ac6f36d7 100644 --- a/src/tables.c +++ b/src/tables.c @@ -1394,9 +1394,6 @@ option_type option_info[] = { &show_store_graph, TRUE, 1, 15, "show_store_graph", "Show graphics in stores" }, - { &show_choices, TRUE, 1, 16, - "show_choices", "Show choices in certain sub-windows" }, - { &show_details, TRUE, 1, 17, "show_details", "Show details in certain sub-windows" }, diff --git a/src/variable.c b/src/variable.c index 135edb1c..174a2654 100644 --- a/src/variable.c +++ b/src/variable.c @@ -211,7 +211,6 @@ bool_ stack_force_notes; /* Merge inscriptions when stacking */ bool_ stack_force_costs; /* Merge discounts when stacking */ bool_ show_labels; /* Show labels in object listings */ -bool_ show_choices; /* Show choices in certain sub-windows */ bool_ show_details; /* Show details in certain sub-windows */ bool_ ring_bell; /* Ring the bell (on errors, etc) */ |