summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2013-07-18 18:56:01 +0200
committerBardur Arantsson <bardur@scientician.net>2013-09-27 14:46:42 +0200
commit7e88e06c6ea90c48c225ac89a7d7685dfa76cd65 (patch)
treec9f796daa671c17bd4d33a5181c0f715b8d30668
parent56d0f51e60757a0ebded8dd94663441b5501485c (diff)
Remove the stack_force_* and stack_allow_* options
We now behave as if they were all true.
-rw-r--r--lib/help/macrofaq.txt10
-rw-r--r--lib/help/option.txt22
-rw-r--r--lib/mods/theme/help/macrofaq.txt10
-rw-r--r--lib/mods/theme/help/option.txt22
-rw-r--r--lib/mods/theme/user/all.prf12
-rw-r--r--src/externs.h4
-rw-r--r--src/object2.cc10
-rw-r--r--src/tables.cc12
-rw-r--r--src/variable.cc6
9 files changed, 2 insertions, 106 deletions
diff --git a/lib/help/macrofaq.txt b/lib/help/macrofaq.txt
index 03a00eaa..836398d0 100644
--- a/lib/help/macrofaq.txt
+++ b/lib/help/macrofaq.txt
@@ -1070,15 +1070,7 @@ create a macro for a function key.
#####G5.2 How can I automatically inscribe items when I pick them up?
#####G----------------------------------------------------------------------
-You need to turn on the "Merge inscriptions when stacking" option.
-If you are already carrying the same item with an inscription, a new
-one will be added to the stack. Note that this WON'T merge discounts.
-Although discounts display like inscriptions, they are different.
-
-1) = Options
-2) 1 User interface options
-3) "Merge inscriptions when stacking" (stack_force_notes)
- move down to this line and change to "yes".
+(Content removed because it was obsolete. Inscribe-on-pickup is now the default.)
#####G----------------------------------------------------------------------
#####G5.3 Can I use macros inside other macros?
diff --git a/lib/help/option.txt b/lib/help/option.txt
index c48d76a8..f5a10ef4 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -113,16 +113,6 @@ off at will during the course of the game.
Display the dungeon depth in "feet" instead of as a level number (one
level is equivalent to 50'). This also affects the monster memory display.
-#####GMerge inscriptions when stacking [stack_force_notes]
- Force otherwise identical objects to merge, even if one has an empty
- inscription and the other does not. The resulting stack keeps the
- non-empty inscription.
-
-#####GMerge discounts when stacking [stack_force_costs]
- Force otherwise identical objects to merge, even if they have different
- discounts. The resulting stack keeps the largest discount. This option
- may cause you to lose "value", but will give you optimal pack usage.
-
#####GAudible bell (on errors, etc) [ring_bell]
Attempt to make a "bell" noise when various errors occur.
@@ -257,18 +247,6 @@ off at will during the course of the game.
is based on the dungeon level, so the deeper you go, the better the
level will be.
-#####GAllow weapons and armor to stack [stack_allow_items]
- Allow identical weapons and armor to be combined into a stack. This
- also allows unidentified, but identical, ammo to be combined, which
- may result in the auto-identification of some of the ammo, but which
- makes it a lot easier to actually use unidentified ammo.
-
-#####GAllow wands/staffs/rods to stack [stack_allow_wands]
- Allow identical wands/staffs/rods to be combined into a stack. This
- may force the items to be unstacked to use them, which may result
- in overflow of the pack. Also, the entire stack can be recharged
- (and possibly destroyed) at the same time.
-
#####GExpand the power of the look command [expand_look]
Expand the "l"ook command to allow the user to look at grids which
are not actually in view of the player, allowing the examination of
diff --git a/lib/mods/theme/help/macrofaq.txt b/lib/mods/theme/help/macrofaq.txt
index 97fad944..e17fa573 100644
--- a/lib/mods/theme/help/macrofaq.txt
+++ b/lib/mods/theme/help/macrofaq.txt
@@ -1070,15 +1070,7 @@ create a macro for a function key.
#####G5.2 How can I automatically inscribe items when I pick them up?
#####G----------------------------------------------------------------------
-You need to turn on the "Merge inscriptions when stacking" option.
-If you are already carrying the same item with an inscription, a new
-one will be added to the stack. Note that this WON'T merge discounts.
-Although discounts display like inscriptions, they are different.
-
-1) = Options
-2) 1 User interface options
-3) "Merge inscriptions when stacking" (stack_force_notes)
- move down to this line and change to "yes".
+(Content removed because it was obsolete. Inscribe-on-pickup is now the default.)
#####G----------------------------------------------------------------------
#####G5.3 Can I use macros inside other macros?
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 6f538d91..8b2e77f3 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -113,16 +113,6 @@ off at will during the course of the game.
Display the dungeon depth in "feet" instead of as a level number (one
level is equivalent to 50'). This also affects the monster memory display.
-#####GMerge inscriptions when stacking [stack_force_notes]
- Force otherwise identical objects to merge, even if one has an empty
- inscription and the other does not. The resulting stack keeps the
- non-empty inscription.
-
-#####GMerge discounts when stacking [stack_force_costs]
- Force otherwise identical objects to merge, even if they have different
- discounts. The resulting stack keeps the largest discount. This option
- may cause you to lose "value", but will give you optimal pack usage.
-
#####GAudible bell (on errors, etc) [ring_bell]
Attempt to make a "bell" noise when various errors occur.
@@ -257,18 +247,6 @@ off at will during the course of the game.
is based on the dungeon level, so the deeper you go, the better the
level will be.
-#####GAllow weapons and armor to stack [stack_allow_items]
- Allow identical weapons and armor to be combined into a stack. This
- also allows unidentified, but identical, ammo to be combined, which
- may result in the auto-identification of some of the ammo, but which
- makes it a lot easier to actually use unidentified ammo.
-
-#####GAllow wands/staffs/rods to stack [stack_allow_wands]
- Allow identical wands/staffs/rods to be combined into a stack. This
- may force the items to be unstacked to use them, which may result
- in overflow of the pack. Also, the entire stack can be recharged
- (and possibly destroyed) at the same time.
-
#####GExpand the power of the look command [expand_look]
Expand the "l"ook command to allow the user to look at grids which
are not actually in view of the player, allowing the examination of
diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf
index fbb9de81..ee5e95dd 100644
--- a/lib/mods/theme/user/all.prf
+++ b/lib/mods/theme/user/all.prf
@@ -26,12 +26,6 @@ Y:always_repeat
# Option 'Show dungeon level in feet'
X:depth_in_feet
-# Option 'Merge inscriptions when stacking'
-Y:stack_force_notes
-
-# Option 'Merge discounts when stacking'
-Y:stack_force_costs
-
# Option 'Show labels in object listings'
Y:show_labels
@@ -122,12 +116,6 @@ Y:auto_haggle
# Option 'Auto-scum for good levels'
Y:auto_scum
-# Option 'Allow weapons and armour to stack'
-Y:stack_allow_items
-
-# Option 'Allow wands/staffs/rods to stack'
-Y:stack_allow_wands
-
# Option 'Expand the power of the look command'
Y:expand_look
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 */