From 4ac43f667228f37723071895b654422bbaad4835 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Jun 2012 20:51:34 +0200
Subject: Remove "show_labels" option

---
 src/object1.c  | 14 +++-----------
 src/tables.c   |  3 ---
 src/variable.c |  1 -
 3 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'src')

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 */
-- 
cgit v1.2.3