summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:56 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:56 +0100
commit10cae3d5dd2128db2899fe0e3cd808edec5b33b3 (patch)
tree32c23f9b2dd62a264b17a6285372f25861f4ed69
parentc3b0ab778853a33620e84793a3c6bdb53c9be0ab (diff)
Remove depth_in_feet option; always use level
-rw-r--r--lib/help/macrofaq.txt2
-rw-r--r--lib/help/option.txt4
-rw-r--r--lib/mods/theme/help/macrofaq.txt2
-rw-r--r--lib/mods/theme/help/option.txt4
-rw-r--r--lib/mods/theme/user/all.prf3
-rw-r--r--src/externs.h1
-rw-r--r--src/monster1.cc26
-rw-r--r--src/notes.cc1
-rw-r--r--src/tables.cc3
-rw-r--r--src/variable.cc1
-rw-r--r--src/xtra1.cc19
11 files changed, 6 insertions, 60 deletions
diff --git a/lib/help/macrofaq.txt b/lib/help/macrofaq.txt
index 836398d0..faa1a49d 100644
--- a/lib/help/macrofaq.txt
+++ b/lib/help/macrofaq.txt
@@ -1776,9 +1776,7 @@ options screen.
rogue_like_commands
use_old_target
always_pickup
-depth_in_feet
alert_hitpoint
-auto_haggle
auto_scum
#####G----------------------------------------------------------------------
diff --git a/lib/help/option.txt b/lib/help/option.txt
index c4f4f40e..6f6c3c1b 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -109,10 +109,6 @@ off at will during the course of the game.
a door, tunnel through walls, or disarm traps or chests, that you
wish to repeat the command 99 times (see *****command.txt*0["command.txt"]).
-#####GShow dungeon level in feet [depth_in_feet]
- Display the dungeon depth in "feet" instead of as a level number (one
- level is equivalent to 50'). This also affects the monster memory display.
-
#####GAudible bell (on errors, etc) [ring_bell]
Attempt to make a "bell" noise when various errors occur.
diff --git a/lib/mods/theme/help/macrofaq.txt b/lib/mods/theme/help/macrofaq.txt
index e17fa573..c7f623a2 100644
--- a/lib/mods/theme/help/macrofaq.txt
+++ b/lib/mods/theme/help/macrofaq.txt
@@ -1780,9 +1780,7 @@ options screen.
rogue_like_commands
use_old_target
always_pickup
-depth_in_feet
alert_hitpoint
-auto_haggle
auto_scum
#####G----------------------------------------------------------------------
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 7841bf89..4070a769 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -109,10 +109,6 @@ off at will during the course of the game.
a door, tunnel through walls, or disarm traps or chests, that you
wish to repeat the command 99 times (see *****command.txt*0["command.txt"]).
-#####GShow dungeon level in feet [depth_in_feet]
- Display the dungeon depth in "feet" instead of as a level number (one
- level is equivalent to 50'). This also affects the monster memory display.
-
#####GAudible bell (on errors, etc) [ring_bell]
Attempt to make a "bell" noise when various errors occur.
diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf
index b21abb03..f17e31ed 100644
--- a/lib/mods/theme/user/all.prf
+++ b/lib/mods/theme/user/all.prf
@@ -23,9 +23,6 @@ Y:prompt_pickup_heavy
# Option 'Repeat obvious commands'
Y:always_repeat
-# Option 'Show dungeon level in feet'
-X:depth_in_feet
-
# Option 'Show labels in object listings'
Y:show_labels
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)