diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2013-07-18 18:56:01 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2013-09-27 14:46:42 +0200 |
| commit | 7e88e06c6ea90c48c225ac89a7d7685dfa76cd65 (patch) | |
| tree | c9f796daa671c17bd4d33a5181c0f715b8d30668 /src | |
| parent | 56d0f51e60757a0ebded8dd94663441b5501485c (diff) | |
Remove the stack_force_* and stack_allow_* options
We now behave as if they were all true.
Diffstat (limited to 'src')
| -rw-r--r-- | src/externs.h | 4 | ||||
| -rw-r--r-- | src/object2.cc | 10 | ||||
| -rw-r--r-- | src/tables.cc | 12 | ||||
| -rw-r--r-- | src/variable.cc | 6 |
4 files changed, 0 insertions, 32 deletions
diff --git a/src/externs.h b/src/externs.h index 29a64267..c9219579 100644 --- a/src/externs.h +++ b/src/externs.h @@ -232,10 +232,6 @@ extern bool_ monster_lite; extern bool_ flow_by_sound; extern bool_ track_follow; extern bool_ track_target; -extern bool_ stack_allow_items; -extern bool_ stack_allow_wands; -extern bool_ stack_force_notes; -extern bool_ stack_force_costs; extern bool_ view_reduce_lite; extern bool_ view_reduce_view; extern bool_ auto_scum; diff --git a/src/object2.cc b/src/object2.cc index 59037ab1..c2808957 100644 --- a/src/object2.cc +++ b/src/object2.cc @@ -1714,9 +1714,6 @@ bool_ object_similar(object_type *o_ptr, object_type *j_ptr) case TV_TRAPKIT: case TV_DAEMON_BOOK: { - /* Require permission */ - if (!stack_allow_items) return (0); - /* Fall through */ } @@ -1822,13 +1819,6 @@ bool_ object_similar(object_type *o_ptr, object_type *j_ptr) /* Hack -- require semi-matching "inscriptions" */ if (o_ptr->note && j_ptr->note && (o_ptr->note != j_ptr->note)) return (0); - /* Hack -- normally require matching "inscriptions" */ - if (!stack_force_notes && (o_ptr->note != j_ptr->note)) return (0); - - /* Hack -- normally require matching "discounts" */ - if (!stack_force_costs && (o_ptr->discount != j_ptr->discount)) return (0); - - /* Maximal "stacking" limit */ if (total >= MAX_STACK_SIZE) return (0); diff --git a/src/tables.cc b/src/tables.cc index 20d24966..b3b616bb 100644 --- a/src/tables.cc +++ b/src/tables.cc @@ -1400,12 +1400,6 @@ option_type option_info[] = { &depth_in_feet, FALSE, 1, 8, "depth_in_feet", "Show dungeon level in feet" }, - { &stack_force_notes, TRUE, 1, 9, - "stack_force_notes", "Merge inscriptions when stacking" }, - - { &stack_force_costs, FALSE, 1, 10, - "stack_force_costs", "Merge discounts when stacking" }, - { &ring_bell, FALSE, 1, 18, "ring_bell", "Audible bell (on errors, etc)" }, /* Changed to default to FALSE -- it's so extremely annoying!!! -TY */ @@ -1483,12 +1477,6 @@ option_type option_info[] = { &auto_scum, TRUE, 3, 1, "auto_scum", "Auto-scum for good levels" }, - { &stack_allow_items, TRUE, 3, 2, - "stack_allow_items", "Allow weapons and armour to stack" }, - - { &stack_allow_wands, TRUE, 3, 3, - "stack_allow_wands", "Allow wands/staffs/rods to stack" }, - { &expand_look, FALSE, 3, 4, "expand_look", "Expand the power of the look command" }, diff --git a/src/variable.cc b/src/variable.cc index adab0232..89df6cc5 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -193,9 +193,6 @@ bool_ prompt_pickup_heavy; /* Don't pick up the corpses */ bool_ always_repeat; /* Repeat obvious commands */ bool_ depth_in_feet; /* Show dungeon level in feet */ -bool_ stack_force_notes; /* Merge inscriptions when stacking */ -bool_ stack_force_costs; /* Merge discounts when stacking */ - bool_ ring_bell; /* Ring the bell (on errors, etc) */ @@ -233,9 +230,6 @@ bool_ disturb_pets; /* Pets moving nearby disturb us */ bool_ auto_scum; /* Auto-scum for good levels */ -bool_ stack_allow_items; /* Allow weapons and armor to stack */ -bool_ stack_allow_wands; /* Allow wands/staffs/rods to stack */ - bool_ expand_look; /* Expand the power of the look command */ bool_ expand_list; /* Expand the power of the list commands */ |