diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/invent.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/menu.cc | 7 | ||||
-rw-r--r-- | crawl-ref/source/menu.h | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index c49792734d..6610fb180c 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -274,6 +274,7 @@ InvMenu::InvMenu(int mflags) title_annotate(NULL) { mdisplay->set_num_columns(2); + text_only = false; } // Returns vector of item_def pointers to each item_def in the given diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 301b35371c..50faf2a82f 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -84,7 +84,7 @@ Menu::Menu( int _flags, const std::string& tagname ) flags(_flags), tag(tagname), first_entry(0), y_offset(0), pagesize(0), max_pagesize(0), more("-more-", true), items(), sel(), select_filter(), highlighter(new MenuHighlighter), num(-1), - lastch(0), alive(false), last_selected(-1) + lastch(0), alive(false), text_only(true), last_selected(-1) { #ifdef USE_TILE mdisplay = new MenuDisplayTile(this); @@ -272,7 +272,10 @@ std::vector<MenuEntry *> Menu::show(bool reuse_selections) // Lose lines for the title + room for -more- line. #ifdef USE_TILE - pagesize = max_pagesize - !!title - 1; + if (text_only) + pagesize = get_number_of_lines() - !!title - 1; + else + pagesize = max_pagesize - !!title - 1; #else pagesize = get_number_of_lines() - !!title - 1; if (max_pagesize > 0 && pagesize > max_pagesize) diff --git a/crawl-ref/source/menu.h b/crawl-ref/source/menu.h index afb9b9a7d6..264e020057 100644 --- a/crawl-ref/source/menu.h +++ b/crawl-ref/source/menu.h @@ -329,6 +329,9 @@ protected: bool alive; + // For tiles, whether this is a menu that can display graphics. + bool text_only; + int last_selected; MenuDisplay *mdisplay; |