From 07339db486c538b44b7c9488943dfb34c2ae24e4 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 26 Jun 2012 20:44:17 +0200
Subject: Remove "show_choices" option

---
 lib/help/option.txt            |  3 ---
 lib/mods/theme/help/option.txt |  3 ---
 src/cmd5.c                     | 24 ++++--------------------
 src/object1.c                  |  2 --
 src/tables.c                   |  3 ---
 src/variable.c                 |  1 -
 6 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/lib/help/option.txt b/lib/help/option.txt
index abee7b51..84ef4d42 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -161,9 +161,6 @@ off at will during the course of the game.
 #####GShow graphics in stores   [show_store_graph]
     Display the graphics of objects in the store list.
 
-#####GShow choices in certain sub-windows    [show_choices]
-    Indicate legal choices in special windows which display lists.
-
 #####GShow details in certain sub-windows    [show_details]
     Indicate extra details in special windows, currently used to activate
     the display of death counts and monster descriptions when recalling
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 3ae9cacc..696bb56d 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -161,9 +161,6 @@ off at will during the course of the game.
 #####GShow graphics in stores   [show_store_graph]
     Display the graphics of objects in the store list.
 
-#####GShow choices in certain sub-windows    [show_choices]
-    Indicate legal choices in special windows which display lists.
-
 #####GShow details in certain sub-windows    [show_details]
     Indicate extra details in special windows, currently used to activate
     the display of death counts and monster descriptions when recalling
diff --git a/src/cmd5.c b/src/cmd5.c
index 51fd6f17..c32d5690 100644
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -2204,11 +2204,7 @@ s32b get_school_spell(cptr do_what, s16b force_book)
 	flag = FALSE;
 
 	/* Show choices */
-	if (show_choices)
-	{
-		/* Window stuff */
-		window_stuff();
-	}
+	window_stuff();
 
 	/* No spell to cast by default */
 	spell = -1;
@@ -2332,11 +2328,7 @@ s32b get_school_spell(cptr do_what, s16b force_book)
 
 
 	/* Show choices */
-	if (show_choices)
-	{
-		/* Window stuff */
-		window_stuff();
-	}
+	window_stuff();
 
 
 	/* Abort if needed */
@@ -2383,11 +2375,7 @@ void browse_school_spell(int book, int pval, object_type *o_ptr)
 	char out_val[160];
 
 	/* Show choices */
-	if (show_choices)
-	{
-		/* Window stuff */
-		window_stuff();
-	}
+	window_stuff();
 
 	num = school_book_length(book);
 
@@ -2438,11 +2426,7 @@ void browse_school_spell(int book, int pval, object_type *o_ptr)
 	character_icky = FALSE;
 
 	/* Show choices */
-	if (show_choices)
-	{
-		/* Window stuff */
-		window_stuff();
-	}
+	window_stuff();
 }
 
 /* Can it contains a schooled spell ? */
diff --git a/src/object1.c b/src/object1.c
index fd9ead08..8cec49d8 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -5428,7 +5428,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 	while (!done)
 	{
 		/* Show choices */
-		if (show_choices)
 		{
 			int ni = 0;
 			int ne = 0;
@@ -5911,7 +5910,6 @@ bool_ get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 	}
 
 	/* Clean up */
-	if (show_choices)
 	{
 		/* Toggle again if needed */
 		if (toggle) toggle_inven_equip();
diff --git a/src/tables.c b/src/tables.c
index 74bd66f2..ac6f36d7 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1394,9 +1394,6 @@ option_type option_info[] =
 	{ &show_store_graph, TRUE, 1, 15,
 	  "show_store_graph", "Show graphics in stores" },
 
-	{ &show_choices, TRUE, 1, 16,
-	  "show_choices", "Show choices in certain sub-windows" },
-
 	{ &show_details, TRUE, 1, 17,
 	  "show_details", "Show details in certain sub-windows" },
 
diff --git a/src/variable.c b/src/variable.c
index 135edb1c..174a2654 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -211,7 +211,6 @@ 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_ show_choices; 			/* Show choices in certain sub-windows */
 bool_ show_details; 			/* Show details in certain sub-windows */
 
 bool_ ring_bell; 				/* Ring the bell (on errors, etc) */
-- 
cgit v1.2.3