Remove show_*_graph options

5 files changed, 13 insertions, 31 deletions

diff --git a/src/externs.h b/src/externs.h
index fc930559..f86be687 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -188,9 +188,6 @@ extern int artifact_bias;
 extern FILE *text_out_file;
 extern void (*text_out_hook)(byte a, cptr str);
 extern int text_out_indent;
-extern bool_ show_inven_graph;
-extern bool_ show_store_graph;
-extern bool_ show_equip_graph;
 extern bool_ rogue_like_commands;
 extern bool_ quick_messages;
 extern bool_ other_query_flag;
diff --git a/src/object1.c b/src/object1.c
index 504bc9c9..dd27c27e 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -4503,8 +4503,8 @@ void show_inven_aux(bool_ mirror, bool_ everything)
 	/* Space for weight */
 	lim -= 9;
 
-	/* Require space for icon */
-	if (show_inven_graph) lim -= 2;
+	/* Space for icon */
+	lim -= 2;
 
 	/* Find the "final" slot */
 	for (i = 0; i < INVEN_PACK; i++)
@@ -4552,8 +4552,8 @@ void show_inven_aux(bool_ mirror, bool_ everything)
 		/* Be sure to account for the weight */
 		l += 9;
 
-		/* Account for icon if displayed */
-		if (show_inven_graph) l += 2;
+		/* Account for icon */
+		l += 2;
 
 		/* Maintain the maximum length */
 		if (l > len) len = l;
@@ -4588,8 +4588,7 @@ void show_inven_aux(bool_ mirror, bool_ everything)
 		/* Clear the line with the (possibly indented) index */
 		c_put_str(get_item_letter_color(o_ptr), tmp_val, row + j, col);
 
-		/* Display graphics for object, if desired */
-		if (show_inven_graph)
+		/* Display graphics for object */
 		{
 			byte a = object_attr(o_ptr);
 			char c = object_char(o_ptr);
@@ -4599,10 +4598,9 @@ void show_inven_aux(bool_ mirror, bool_ everything)
 			Term_draw(col + 3, row + j, a, c);
 		}
 
-
 		/* Display the entry itself */
 		c_put_str(out_color[j], out_desc[j], row + j,
-		          show_inven_graph ? (col + 5) : (col + 3));
+		          col + 5);
 
 		/* Display the weight */
 		{
@@ -4680,7 +4678,8 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 	/* Require space for weight */
 	lim -= 9;
 
-	if (show_equip_graph) lim -= 2;
+	/* Require space for icon */
+	lim -= 2;
 
 	/* Scan the equipment list */
 	idx = 0;
@@ -4781,7 +4780,8 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 		/* Increase length for weight */
 		l += 9;
 
-		if (show_equip_graph) l += 2;
+		/* Icon */
+		l += 2;
 
 		/* Maintain the max-length */
 		if (l > len) len = l;
@@ -4817,7 +4817,7 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 		/* Clear the line with the (possibly indented) index */
 		c_put_str(get_item_letter_color(o_ptr), tmp_val, row + j, col);
 
-		if (show_equip_graph)
+		/* Show icon */
 		{
 			byte a = object_attr(o_ptr);
 			char c = object_char(o_ptr);
@@ -4831,10 +4831,10 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 		{
 			/* Mention the use */
 			(void)sprintf(tmp_val, "%-14s: ", mention_use(out_rindex[j]));
-			put_str(tmp_val, row + j, show_equip_graph ? col + 5 : col + 3);
+			put_str(tmp_val, row + j, col + 5);
 
 			/* Display the entry itself */
-			c_put_str(out_color[j], out_desc[j], row + j, show_equip_graph ? col + 21 : col + 19);
+			c_put_str(out_color[j], out_desc[j], row + j, col + 21);
 		}
 
 		/* Display the weight */
diff --git a/src/store.c b/src/store.c
index 6cdaad4a..e1977920 100644
--- a/src/store.c
+++ b/src/store.c
@@ -1647,7 +1647,6 @@ static void display_entry(int pos)
 
 
 	cur_col = 3;
-	if (show_store_graph)
 	{
 		byte a = object_attr(o_ptr);
 		char c = object_char(o_ptr);
diff --git a/src/tables.c b/src/tables.c
index a66557cc..60550de7 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1382,15 +1382,6 @@ option_type option_info[] =
 	{ &stack_force_costs, FALSE, 1, 10,
 	  "stack_force_costs", "Merge discounts when stacking" },
 
-	{ &show_inven_graph, TRUE, 1, 13,
-	  "show_inven_graph", "Show graphics in inventory list" },
-
-	{ &show_equip_graph, TRUE, 1, 14,
-	  "show_equip_graph", "Show graphics in equipment list" },
-
-	{ &show_store_graph, TRUE, 1, 15,
-	  "show_store_graph", "Show graphics in stores" },
-
 	{ &ring_bell, FALSE, 1, 18,
 	  "ring_bell", "Audible bell (on errors, etc)" },
 	/* Changed to default to FALSE -- it's so extremely annoying!!! -TY */
diff --git a/src/variable.c b/src/variable.c
index 2510f6dd..9f828da9 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -199,11 +199,6 @@ bool_ stack_force_costs; 		/* Merge discounts when stacking */
 
 bool_ ring_bell; 				/* Ring the bell (on errors, etc) */
 
-bool_ show_inven_graph; 		/* Show graphics in inventory */
-bool_ show_equip_graph; 		/* Show graphics in equip list */
-bool_ show_store_graph; 		/* Show graphics in store */
-
-
 
 /* Option Set 2 -- Disturbance */