diff options
Diffstat (limited to 'crawl-ref/source/menu.cc')
-rw-r--r-- | crawl-ref/source/menu.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index c379460d8f..660786404e 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -991,12 +991,14 @@ bool slider_menu::line_up() // Menu colouring // -int menu_colour(const std::string &text) +int menu_colour(const std::string &text, const std::string &prefix) { + std::string tmp_text = prefix + text; + for (int i = 0, size = Options.menu_colour_mappings.size(); i < size; ++i) { colour_mapping &cm = Options.menu_colour_mappings[i]; - if (cm.pattern.matches(text)) + if (cm.pattern.matches(tmp_text)) return (cm.colour); } return (-1); @@ -1004,7 +1006,7 @@ int menu_colour(const std::string &text) int MenuHighlighter::entry_colour(const MenuEntry *entry) const { - return (::menu_colour(entry->get_text())); + return entry->highlight_colour(); } /////////////////////////////////////////////////////////////////////// |