summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/menu.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-17 13:43:42 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-17 13:43:42 +0000
commitf672c6472dfa1ac6fa64f1d77e5701589576ca6c (patch)
tree96309e9add139ef71e0ba3f529f7502ebb2e1530 /crawl-ref/source/menu.cc
parent7a0cf4fa055dbebc676db78dde82881be8a6e6af (diff)
downloadcrawl-ref-f672c6472dfa1ac6fa64f1d77e5701589576ca6c.tar.gz
crawl-ref-f672c6472dfa1ac6fa64f1d77e5701589576ca6c.zip
Allow specific colouring of pickup menu (as opposed to general
inventory). To do so, use "pickup:colour:pattern". git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4287 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
-rw-r--r--crawl-ref/source/menu.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc
index 2e6e291001..6d004e968d 100644
--- a/crawl-ref/source/menu.cc
+++ b/crawl-ref/source/menu.cc
@@ -1169,8 +1169,9 @@ int menu_colour(const std::string &text, const std::string &prefix,
for (unsigned int i = 0; i < Options.menu_colour_mappings.size(); ++i)
{
const colour_mapping &cm = Options.menu_colour_mappings[i];
- if ( (cm.tag.empty() || cm.tag == "any" || cm.tag == tag) &&
- cm.pattern.matches(tmp_text) )
+ if ( (cm.tag.empty() || cm.tag == "any" || cm.tag == tag
+ || cm.tag == "inventory" && tag == "pickup")
+ && cm.pattern.matches(tmp_text) )
{
return (cm.colour);
}