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/object2.cc | |
| parent | 56d0f51e60757a0ebded8dd94663441b5501485c (diff) | |
Remove the stack_force_* and stack_allow_* options
We now behave as if they were all true.
Diffstat (limited to 'src/object2.cc')
| -rw-r--r-- | src/object2.cc | 10 |
1 files changed, 0 insertions, 10 deletions
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); |