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 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/object1.c')

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