Remove expand_{list,look} options; behave as if always set

5 files changed, 0 insertions, 19 deletions

diff --git a/src/cmd3.cc b/src/cmd3.cc
index 529ec06b..d57d482a 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -1578,7 +1578,6 @@ void do_cmd_query_symbol(void)
 			if (static_cast<size_t>(i) == who.size())
 			{
 				i = 0;
-				if (!expand_list) break;
 			}
 		}
 
@@ -1588,7 +1587,6 @@ void do_cmd_query_symbol(void)
 			if (i-- == 0)
 			{
 				i = who.size() - 1;
-				if (!expand_list) break;
 			}
 		}
 	}
@@ -1774,7 +1772,6 @@ bool_ research_mon()
 			if (static_cast<size_t>(i) == who.size())
 			{
 				i = 0;
-				if (!expand_list) break;
 			}
 		}
 
@@ -1784,7 +1781,6 @@ bool_ research_mon()
 			if (i-- == 0)
 			{
 				i = who.size() - 1;
-				if (!expand_list) break;
 			}
 		}
 	}
diff --git a/src/options.cc b/src/options.cc
index 1a12fc56..5501ab52 100644
--- a/src/options.cc
+++ b/src/options.cc
@@ -38,8 +38,6 @@ bool_ disturb_pets; 		/* Pets moving nearby disturb us */
 // Option Set 3 -- Game-Play
 //
 bool_ auto_scum; 				/* Auto-scum for good levels */
-bool_ expand_look; 			/* Expand the power of the look command */
-bool_ expand_list; 			/* Expand the power of the list commands */
 bool_ view_perma_grids; 		/* Map remembers all perma-lit grids */
 bool_ view_torch_grids; 		/* Map remembers all torch-lit grids */
 bool_ dungeon_align; 			/* Generate dungeons with aligned rooms */
diff --git a/src/options.hpp b/src/options.hpp
index 39757c83..45e19cf7 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -40,8 +40,6 @@ extern bool_ disturb_pets;
 // Option Set 3 -- Game-Play
 //
 extern bool_ auto_scum;
-extern bool_ expand_look;
-extern bool_ expand_list;
 extern bool_ view_perma_grids;
 extern bool_ view_torch_grids;
 extern bool_ dungeon_align;
diff --git a/src/tables.cc b/src/tables.cc
index 19e705c3..b91c1a6a 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1356,12 +1356,6 @@ option_type option_info[] =
 	{ &auto_scum, TRUE, 3, 1,
 	  "auto_scum", "Auto-scum for good levels" },
 
-	{ &expand_look, FALSE, 3, 4,
-	  "expand_look", "Expand the power of the look command" },
-
-	{ &expand_list, FALSE, 3, 5,
-	  "expand_list", "Expand the power of the list commands" },
-
 	{ &view_perma_grids, TRUE, 3, 6,
 	  "view_perma_grids", "Map remembers all perma-lit grids" },
 
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 8b76400d..07a8d571 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -4093,9 +4093,6 @@ static void target_set_prepare(int mode)
 		{
 			cave_type *c_ptr = &cave[y][x];
 
-			/* Require line of sight, unless "look" is "expanded" */
-			if (!expand_look && !player_has_los_bold(y, x)) continue;
-
 			/* Require "interesting" contents */
 			if (!target_set_accept(y, x)) continue;
 
@@ -4729,7 +4726,6 @@ bool_ target_set(int mode)
 					if (++m == temp_n)
 					{
 						m = 0;
-						if (!expand_list) done = TRUE;
 					}
 					break;
 				}
@@ -4739,7 +4735,6 @@ bool_ target_set(int mode)
 					if (m-- == 0)
 					{
 						m = temp_n - 1;
-						if (!expand_list) done = TRUE;
 					}
 					break;
 				}