Remove the level_map_title option.

5 files changed, 4 insertions, 17 deletions

diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index 1aa57873fd..a28c0f9e08 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -35,7 +35,7 @@ The contents of this text are:
                 friend_brand, neutral_brand, stab_brand, may_stab_brand,
                 heap_brand, feature_item_brand, trap_item_brand
 3-e     Level Map Functions.
-                level_map_cursor_step, level_map_title, show_waypoints
+                level_map_cursor_step, show_waypoints
 3-f     Viewport Display Options.
                 view_max_width, view_max_height, view_lock_x,
                 view_lock_y, view_lock, center_on_scroll,
@@ -636,10 +636,6 @@ level_map_cursor_step = 7
         How many squares the cursor moves on the level map when using
         Shift-direction.
 
-level_map_title = true
-        Whether to show the level name at the top of the level map
-        screen.
-
 show_waypoints = true
         Whether to display a number on the level map to indicate
         waypoints (placed with the Ctrl-W command).
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index f86281e483..b2e85aeaed 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -116,7 +116,6 @@
 ##### 3-e       Level Map Functions ###################
 #
 # level_map_cursor_step = 7
-# level_map_title = false
 # show_waypoints = false
 
 ##### 3-f       Viewport Options  ###################
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 7716989954..4763e5de30 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -879,8 +879,6 @@ void game_options::reset_options()
     easy_exit_menu         = false;
     dos_use_background_intensity = true;
 
-    level_map_title        = true;
-
     assign_item_slot       = SS_FORWARD;
     show_god_gift          = MB_MAYBE;
 
@@ -3422,7 +3420,6 @@ void game_options::read_option_line(const string &str, bool runscript)
             dump_item_origin_price = -1;
     }
     else BOOL_OPTION(dump_book_spells);
-    else BOOL_OPTION(level_map_title);
     else if (key == "darken_beyond_range")
         darken_beyond_range = _read_bool(field, darken_beyond_range);
     else BOOL_OPTION(pickup_menu);
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h
index 00bc3c5a65..3c74a016c1 100644
--- a/crawl-ref/source/options.h
+++ b/crawl-ref/source/options.h
@@ -330,8 +330,6 @@ public:
     // Order of sections in the character dump.
     vector<string> dump_order;
 
-    bool        level_map_title;    // Show title in level map
-
     bool        pickup_menu;        // false for single, true for menu
     int         pickup_menu_limit;  // Over this number of items, menu for
                                     // pickup
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index 51b94097ea..9f3d474e33 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -394,7 +394,7 @@ static int _find_feature(const vector<coord_def>& features,
 
 static int _get_number_of_lines_levelmap()
 {
-    return get_number_of_lines() - (Options.level_map_title ? 1 : 0);
+    return get_number_of_lines() - 1;
 }
 
 #ifndef USE_TILE_LOCAL
@@ -410,7 +410,7 @@ static void _draw_level_map(int start_x, int start_y, bool travel_mode,
 
     cursor_control cs(false);
 
-    int top = 1 + Options.level_map_title;
+    int top = 2;
     cgotoxy(1, top);
     for (int screen_y = 0; screen_y < num_lines; screen_y++)
         for (int screen_x = 0; screen_x < num_cols; screen_x++)
@@ -574,9 +574,6 @@ public:
 #ifndef USE_TILE_LOCAL
 static void _draw_title(const coord_def& cpos, const feature_list& feats)
 {
-    if (!Options.level_map_title)
-        return;
-
     const int columns = get_number_of_cols();
     const formatted_string help =
         formatted_string::parse_string("(Press <w>?</w> for help)");
@@ -759,7 +756,7 @@ bool show_map(level_pos &lpos,
         bool redraw_map = true;
 
 #ifndef USE_TILE_LOCAL
-        const int top = 1 + Options.level_map_title;
+        const int top = 2;
         clrscr();
 #endif
         textcolor(DARKGREY);