allow stash titles to wrap if they are too long (1260)

1 files changed, 9 insertions, 4 deletions

diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index baedba384a..c10d771488 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -314,13 +314,13 @@ vector<MenuEntry *> Menu::show(bool reuse_selections)
     }
 
     // Reset offset to default.
-    mdisplay->set_offset(1 + !!title);
+    mdisplay->set_offset(1 + title_height());
 
     // Lose lines for the title + room for -more- line.
 #ifdef USE_TILE_LOCAL
-    pagesize = max_pagesize - !!title - 1;
+    pagesize = max_pagesize - title_height() - 1;
 #else
-    pagesize = get_number_of_lines() - !!title - 1;
+    pagesize = get_number_of_lines() - title_height() - 1;
     if (max_pagesize > 0 && pagesize > max_pagesize)
         pagesize = max_pagesize;
 #endif
@@ -1274,7 +1274,7 @@ void Menu::draw_menu()
 
     draw_title();
     draw_select_count(sel.size());
-    y_offset = 1 + !!title;
+    y_offset = 1 + title_height();
 
     mdisplay->set_offset(y_offset);
 
@@ -1352,6 +1352,11 @@ void Menu::write_title()
     cgotoxy(x, y);
 }
 
+int Menu::title_height() const
+{
+    return !!title;
+}
+
 bool Menu::in_page(int index) const
 {
     return index >= first_entry && index < first_entry + pagesize;