summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/colour.cc
diff options
context:
space:
mode:
authorMichael Gagno <evilmike@gmail.com>2012-07-03 02:48:00 -0700
committerMichael Gagno <evilmike@gmail.com>2012-07-03 02:48:00 -0700
commita86d5194b1f9ece1c597e17a464f0f7d808d650b (patch)
tree9d46df6f091ebb304bcfb9087ec3e0cf130f05ff /crawl-ref/source/colour.cc
parentab58638c90c94c31eec8fc93e979037c999ecf13 (diff)
downloadcrawl-ref-a86d5194b1f9ece1c597e17a464f0f7d808d650b.tar.gz
crawl-ref-a86d5194b1f9ece1c597e17a464f0f7d808d650b.zip
Rename swamp trees to mangroves.
Since these are opaque (and therefore behave differently from normal trees), a renaming is warranted.
Diffstat (limited to 'crawl-ref/source/colour.cc')
-rw-r--r--crawl-ref/source/colour.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc
index 16c8a89cda..d24a8fdb61 100644
--- a/crawl-ref/source/colour.cc
+++ b/crawl-ref/source/colour.cc
@@ -203,7 +203,7 @@ static int _etc_tree(int, const coord_def& loc)
return (h>>30) ? GREEN : LIGHTGREEN;
}
-static int _etc_swamp_tree(int, const coord_def& loc)
+static int _etc_mangrove(int, const coord_def& loc)
{
uint32_t h = loc.x;
h+=h<<10; h^=h>>6;
@@ -552,7 +552,7 @@ void init_element_colours()
ETC_TREE, "tree", _etc_tree
));
add_element_colour(new element_colour_calc(
- ETC_SWAMP_TREE, "swamp_tree", _etc_swamp_tree
+ ETC_MANGROVE, "mangrove", _etc_mangrove
));
add_element_colour(new element_colour_calc(
ETC_TORNADO, "tornado", _etc_tornado