Remove inventory_no_move option

4 files changed, 19 insertions, 31 deletions

diff --git a/src/object1.cc b/src/object1.cc
index 9e130be9..a3cb5593 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -4066,15 +4066,15 @@ static bool item_tester_okay(object_type const *o_ptr, object_filter_t const &fi
 
 
 
-static void show_equip_aux(bool_ mirror, bool_ everything, object_filter_t const &filter);
-static void show_inven_aux(bool_ mirror, bool_ everything, object_filter_t const &filter);
+static void show_equip_aux(bool_ mirror, object_filter_t const &filter);
+static void show_inven_aux(bool_ mirror, object_filter_t const &filter);
 
 /*
  * Choice window "shadow" of the "show_inven()" function
  */
 void display_inven(void)
 {
-	show_inven_aux(TRUE, inventory_no_move, object_filter::True());
+	show_inven_aux(TRUE, object_filter::True());
 }
 
 
@@ -4084,7 +4084,7 @@ void display_inven(void)
  */
 void display_equip(void)
 {
-	show_equip_aux(TRUE, inventory_no_move, object_filter::True());
+	show_equip_aux(TRUE, object_filter::True());
 }
 
 
@@ -4111,7 +4111,7 @@ byte get_item_letter_color(object_type const *o_ptr)
  *
  * Hack -- do not display "trailing" empty slots
  */
-void show_inven_aux(bool_ mirror, bool_ everything, const object_filter_t &filter)
+void show_inven_aux(bool_ mirror, const object_filter_t &filter)
 {
 	int i, j, k, l, z = 0;
 	int row, col, len, lim;
@@ -4165,16 +4165,13 @@ void show_inven_aux(bool_ mirror, bool_ everything, const object_filter_t &filte
 		/* Is this item acceptable? */
 		if (!item_tester_okay(o_ptr, filter))
 		{
-			if ( !everything )
-				continue;
-			out_index[k] = -i - 1;
-		}
-		else
-		{
-			/* Save the object index */
-			out_index[k] = i + 1;
+			/* Skip to next slot */
+			continue;
 		}
 
+		/* Save the object index */
+		out_index[k] = i + 1;
+
 		/* Describe the object */
 		object_desc(o_name, o_ptr, TRUE, 3);
 
@@ -4273,7 +4270,7 @@ void show_inven_aux(bool_ mirror, bool_ everything, const object_filter_t &filte
 
 static void show_inven(object_filter_t const &filter)
 {
-	show_inven_aux(FALSE, FALSE, filter);
+	show_inven_aux(FALSE, filter);
 }
 
 void show_inven_full()
@@ -4285,7 +4282,7 @@ void show_inven_full()
 
 static void show_equip(object_filter_t const &filter)
 {
-	show_equip_aux(FALSE, FALSE, filter);
+	show_equip_aux(FALSE, filter);
 }
 
 void show_equip_full()
@@ -4298,7 +4295,7 @@ void show_equip_full()
 /*
  * Display the equipment.
  */
-void show_equip_aux(bool_ mirror, bool_ everything, object_filter_t const &filter)
+void show_equip_aux(bool_ mirror, object_filter_t const &filter)
 {
 	int i, j, k, l;
 	int row, col, len, lim, idx;
@@ -4407,17 +4404,16 @@ void show_equip_aux(bool_ mirror, bool_ everything, object_filter_t const &filte
 
 			/* Truncate the description */
 			o_name[lim] = 0;
+
 			/* Is this item acceptable? */
 			if (!item_tester_okay(o_ptr, filter))
 			{
-				if (!everything) continue;
-				out_index[k] = -1;
-			}
-			else
-			{
-				/* Save the index */
-				out_index[k] = idx;
+				/* Skip to next slot */
+				continue;
 			}
+
+			/* Save the index */
+			out_index[k] = idx;
 			out_rindex[k] = i;
 
 			/* Save the color */
diff --git a/src/options.cc b/src/options.cc
index 07dd7869..e4acaab4 100644
--- a/src/options.cc
+++ b/src/options.cc
@@ -70,9 +70,6 @@ bool_ linear_stats;
 bool_ player_char_health;		/* Display the player as a special symbol when in bad health ? */
 bool_ option_ingame_help;		/* Ingame contextual help */
 bool_ auto_more;			/* Auto more */
-bool_ inventory_no_move;		/* In inventory option window, just erase the letters,
-					 * rather that displaying the list without the invalid
-					 * selections */
 
 //
 // Option Set 6 - Birth options
diff --git a/src/options.hpp b/src/options.hpp
index 6900b9a3..80e5cca7 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -72,7 +72,6 @@ extern bool_ linear_stats;
 extern bool_ player_char_health;
 extern bool_ option_ingame_help;
 extern bool_ auto_more;
-extern bool_ inventory_no_move;
 
 //
 // Option Set 6 - Birth options
diff --git a/src/tables.cc b/src/tables.cc
index b48a2565..509a8ce9 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1418,10 +1418,6 @@ option_type option_info[] =
 	{ &linear_stats, TRUE, 5, 7,
 	  "linear_stats", "Stats are represented in a linear way" },
 
-	{ &inventory_no_move, FALSE, 5, 8,
-	  "inventory_no_move", "In option windows, just omit the select char" },
-
-
 	/*** Birth Options ***/
 
 	{ &preserve, TRUE, 6, 2,