diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-17 02:55:58 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-17 02:55:58 +0000 |
commit | 0bc00794625760f93f2d1fd20a78d02aaa7299f9 (patch) | |
tree | 871ae18ee6f478dc7c331bf95011a9efa183a6fc /crawl-ref/source/menu.cc | |
parent | 27a123d67702ee2b24b29df5374cb9a95f53d5af (diff) | |
download | crawl-ref-0bc00794625760f93f2d1fd20a78d02aaa7299f9.tar.gz crawl-ref-0bc00794625760f93f2d1fd20a78d02aaa7299f9.zip |
A handful of new game options:
menu_colour_prefix_id, if set to true, causes the identification state
of an object to be prefixed to the string menu colour regexes are
matched against (but does not alter the string displayed on the screen).
menu_colour_prefix_class, if set to true, prefixes the object's base type
to the string menu colour regexes are matched against.
user_note_prefix can be set to a string which will be prefixed to
manual user notes when they are displayed, to make them easier to find.
detailed_hunger, if set to true, will cause three new informational-only
hunger states to be displayed: near starving, very hungry and very full.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2121 c06c8d41-db1a-0410-9941-cceddc491573
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(); } /////////////////////////////////////////////////////////////////////// |