diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-01 22:43:46 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-01 22:43:46 +0000 |
commit | 2f502ad2e18856b2207756b98d2b54fc6e5764b3 (patch) | |
tree | b107630c10dc120a11a9f6bb3578b9b11c3de416 /crawl-ref/source/menu.cc | |
parent | 6abca99d684429a8d909260cec1f3c0f76f8ecc7 (diff) | |
download | crawl-ref-2f502ad2e18856b2207756b98d2b54fc6e5764b3.tar.gz crawl-ref-2f502ad2e18856b2207756b98d2b54fc6e5764b3.zip |
FR 2026227: Make $ list current gold.
FR 2027307: Use menu colours for shops, with an option to turn it off to
get the striped menu again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6750 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/menu.cc')
-rw-r--r-- | crawl-ref/source/menu.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 03dba10ef3..996c07239d 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -1170,7 +1170,7 @@ int menu_colour(const std::string &text, const std::string &prefix, { const colour_mapping &cm = Options.menu_colour_mappings[i]; if ((cm.tag.empty() || cm.tag == "any" || cm.tag == tag - || cm.tag == "inventory" && tag == "pickup") + || cm.tag == "inventory" && tag == "pickup") && cm.pattern.matches(tmp_text) ) { return (cm.colour); |