Remove "show_labels" option

5 files changed, 3 insertions, 35 deletions

diff --git a/lib/help/option.txt b/lib/help/option.txt
index 0fd71d66..7505f46b 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -140,16 +140,6 @@ off at will during the course of the game.
     discounts.  The resulting stack keeps the largest discount.  This option
     may cause you to lose "value", but will give you optimal pack usage.
 
-#####GShow labels in object lists    [show_labels]
-    Display the "labels" for objects in the equipment list, and in any
-    special window which is displaying the equipment.  These labels
-    indicate what the player is using the object for, such as "wielding"
-    or "wearing" (in a given location).  After you have played for a while,
-    this information is no longer useful, and can be annoying.
-    Note that in ToME this option no longer controls the "plain
-    flavoured object descriptions": a separate option for them has been added
-    under "ToME Options".
-
 #####GShow graphics in inventory list   [show_inven_graph]
     Display the graphics of objects in the inventory list, and in any special
     window which is displaying the inventory list.
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 55062b6b..93b34cd8 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -140,16 +140,6 @@ off at will during the course of the game.
     discounts.  The resulting stack keeps the largest discount.  This option
     may cause you to lose "value", but will give you optimal pack usage.
 
-#####GShow labels in object lists    [show_labels]
-    Display the "labels" for objects in the equipment list, and in any
-    special window which is displaying the equipment.  These labels
-    indicate what the player is using the object for, such as "wielding"
-    or "wearing" (in a given location).  After you have played for a while,
-    this information is no longer useful, and can be annoying.
-    Note that in ToME this option no longer controls the "plain
-    flavoured object descriptions": a separate option for them has been added
-    under "ToME Options".
-
 #####GShow graphics in inventory list   [show_inven_graph]
     Display the graphics of objects in the inventory list, and in any special
     window which is displaying the inventory list.
diff --git a/src/object1.c b/src/object1.c
index 8cec49d8..655e4e2c 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -4702,8 +4702,8 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 	/* Maximum space allowed for descriptions */
 	lim = 79 - 3;
 
-	/* Require space for labels (if needed) */
-	if (show_labels) lim -= (14 + 2);
+	/* Require space for labels */
+	lim -= (14 + 2);
 
 	/* Require space for weight */
 	lim -= 9;
@@ -4804,7 +4804,7 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 		l = strlen(out_desc[k]) + (2 + 3);
 
 		/* Increase length for labels (if needed) */
-		if (show_labels) l += (14 + 2);
+		l += (14 + 2);
 
 		/* Increase length for weight */
 		l += 9;
@@ -4856,7 +4856,6 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 		}
 
 		/* Use labels */
-		if (show_labels)
 		{
 			/* Mention the use */
 			(void)sprintf(tmp_val, "%-14s: ", mention_use(out_rindex[j]));
@@ -4866,13 +4865,6 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 			c_put_str(out_color[j], out_desc[j], row + j, show_equip_graph ? col + 21 : col + 19);
 		}
 
-		/* No labels */
-		else
-		{
-			/* Display the entry itself */
-			c_put_str(out_color[j], out_desc[j], row + j, show_equip_graph ? col + 5 : col + 3);
-		}
-
 		/* Display the weight */
 		{
 			int wgt = o_ptr->weight * o_ptr->number;
diff --git a/src/tables.c b/src/tables.c
index b1fc54e5..e3d3e664 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1382,9 +1382,6 @@ option_type option_info[] =
 	{ &stack_force_costs, FALSE, 1, 10,
 	  "stack_force_costs", "Merge discounts when stacking" },
 
-	{ &show_labels, TRUE, 1, 11,
-	  "show_labels", "Show labels in object listings" },
-
 	{ &show_inven_graph, TRUE, 1, 13,
 	  "show_inven_graph", "Show graphics in inventory list" },
 
diff --git a/src/variable.c b/src/variable.c
index 7c378a24..13209ead 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -210,7 +210,6 @@ 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_ show_labels; 			/* Show labels in object listings */
 bool_ ring_bell; 				/* Ring the bell (on errors, etc) */
 
 bool_ show_inven_graph; 		/* Show graphics in inventory */