Remove depth_in_feet option; always use level

6 files changed, 6 insertions, 45 deletions

diff --git a/src/externs.h b/src/externs.h
index bd8fc3a2..43b27328 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -183,7 +183,6 @@ extern bool_ always_pickup;
 extern bool_ prompt_pickup_heavy;
 extern bool_ always_repeat;
 extern bool_ use_old_target;
-extern bool_ depth_in_feet;
 extern bool_ hilite_player;
 extern bool_ ring_bell;
 extern bool_ find_ignore_stairs;
diff --git a/src/monster1.cc b/src/monster1.cc
index 9bcf9e08..81800962 100644
--- a/src/monster1.cc
+++ b/src/monster1.cc
@@ -373,31 +373,17 @@ static void roff_aux(int r_idx, int ego, int remem)
 			text_out(", ");
 		else
 			text_out(format("%^s ", wd_he[msex]));
-		if (depth_in_feet)
+
+		text_out(format("is normally found on level ", wd_he[msex]));
+		if (dun_level < r_ptr->level) /* out of depth monster */
 		{
-			text_out(format("is normally found at depths of ", wd_he[msex]));
-			if (dun_level < r_ptr->level) /* out of depth monster */
-			{
-				text_out_c(TERM_L_RED, format("%d", r_ptr->level * 50));
-			}
-			else
-			{
-				text_out_c(TERM_L_GREEN, format("%d", r_ptr->level * 50));
-			}
-			text_out(" feet");
+			text_out_c(TERM_L_RED, format("%d", r_ptr->level));
 		}
 		else
 		{
-			text_out(format("is normally found on level ", wd_he[msex]));
-			if (dun_level < r_ptr->level) /* out of depth monster */
-			{
-				text_out_c(TERM_L_RED, format("%d", r_ptr->level));
-			}
-			else
-			{
-				text_out_c(TERM_L_GREEN, format("%d", r_ptr->level));
-			}
+			text_out_c(TERM_L_GREEN, format("%d", r_ptr->level));
 		}
+
 		old = TRUE;
 	}
 
diff --git a/src/notes.cc b/src/notes.cc
index 5d999fa3..ecc64d43 100644
--- a/src/notes.cc
+++ b/src/notes.cc
@@ -99,7 +99,6 @@ void add_note(char *note, char code)
 
 	/* Get depth  */
 	if (!dun_level) strcpy(depths, "  Town");
-	else if (depth_in_feet) sprintf(depths, "%4dft", dun_level * 50);
 	else sprintf(depths, "Lev%3d", dun_level);
 
 	/* Make note */
diff --git a/src/tables.cc b/src/tables.cc
index d9ddbaaf..1fdfa577 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1397,9 +1397,6 @@ option_type option_info[] =
 	{ &always_repeat, TRUE, 1, 7,
 	  "always_repeat", "Repeat obvious commands" },
 
-	{ &depth_in_feet, FALSE, 1, 8,
-	  "depth_in_feet", "Show dungeon level in feet" },
-
 	{ &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.cc b/src/variable.cc
index a37ef0c3..d70f41bb 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -180,7 +180,6 @@ bool_ use_old_target; 		/* Use old target by default */
 bool_ always_pickup;              /* Pick things up by default */
 bool_ prompt_pickup_heavy;        /* Don't pick up the corpses */
 bool_ always_repeat;              /* Repeat obvious commands */
-bool_ depth_in_feet;              /* Show dungeon level in feet */
 
 bool_ ring_bell; 				/* Ring the bell (on errors, etc) */
 
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 1a9a828f..aeb31a06 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -524,25 +524,6 @@ static void prt_depth(int row, int col)
 		else
 			strcpy(depths, "Town/Wild");
 	}
-	else if (depth_in_feet)
-	{
-		if (dungeon_flags1 & DF1_TOWER)
-		{
-			(void)strnfmt(depths, 32, "%c%c%c -%d ft",
-			              d_ptr->short_name[0],
-			              d_ptr->short_name[1],
-			              d_ptr->short_name[2],
-			              dun_level * 50);
-		}
-		else
-		{
-			(void)strnfmt(depths, 32, "%c%c%c %d ft",
-			              d_ptr->short_name[0],
-			              d_ptr->short_name[1],
-			              d_ptr->short_name[2],
-			              dun_level * 50);
-		}
-	}
 	else
 	{
 		if (dungeon_flags1 & DF1_TOWER)