summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/format.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-21 21:25:58 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-21 21:25:58 +0000
commit53b94b89c7037837eb6bf00ea8b71d9f92963f35 (patch)
treebde5ccd8d4071e4aa3b87d1b5c26bdd903e59f1a /crawl-ref/source/format.cc
parent43b1796995f29d920d306860969c751e4bb26640 (diff)
downloadcrawl-ref-53b94b89c7037837eb6bf00ea8b71d9f92963f35.tar.gz
crawl-ref-53b94b89c7037837eb6bf00ea8b71d9f92963f35.zip
Apply commits r10013 and 10014 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10015 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/format.cc')
-rw-r--r--crawl-ref/source/format.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc
index 012c64a181..d6c0d343c5 100644
--- a/crawl-ref/source/format.cc
+++ b/crawl-ref/source/format.cc
@@ -429,10 +429,8 @@ int formatted_string::find_last_colour() const
if (!ops.empty())
{
for (int i = ops.size() - 1; i >= 0; --i)
- {
if (ops[i].type == FSOP_COLOUR)
return (ops[i].x);
- }
}
return (LIGHTGREY);
}