diff options
| author | Michael Gagno <evilmike@gmail.com> | 2012-07-03 02:48:00 -0700 |
|---|---|---|
| committer | Michael Gagno <evilmike@gmail.com> | 2012-07-03 02:48:00 -0700 |
| commit | a86d5194b1f9ece1c597e17a464f0f7d808d650b (patch) | |
| tree | 9d46df6f091ebb304bcfb9087ec3e0cf130f05ff /crawl-ref/source/tilecell.cc | |
| parent | ab58638c90c94c31eec8fc93e979037c999ecf13 (diff) | |
| download | crawl-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/tilecell.cc')
| -rw-r--r-- | crawl-ref/source/tilecell.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/tilecell.cc b/crawl-ref/source/tilecell.cc index adc5755130..b49fe88602 100644 --- a/crawl-ref/source/tilecell.cc +++ b/crawl-ref/source/tilecell.cc @@ -31,7 +31,7 @@ void packed_cell::clear() glowing_mold = false; is_sanctuary = false; is_liquefied = false; - swamp_tree_water = false; + mangrove_water = false; orb_glow = 0; blood_rotation = 0; old_blood = false; @@ -50,7 +50,7 @@ bool packed_cell::operator ==(const packed_cell &other) const if (glowing_mold != other.glowing_mold) return false; if (is_sanctuary != other.is_sanctuary) return false; if (is_liquefied != other.is_liquefied) return false; - if (swamp_tree_water != other.swamp_tree_water) return false; + if (mangrove_water != other.mangrove_water) return false; if (orb_glow != other.orb_glow) return false; if (blood_rotation != other.blood_rotation) return false; if (old_blood != other.old_blood) return false; @@ -280,7 +280,7 @@ static bool _is_seen_shallow(coord_def gc) { const dungeon_feature_type feat = _safe_feat(gc); - return (feat == DNGN_SHALLOW_WATER || feat == DNGN_SWAMP_TREE); + return (feat == DNGN_SHALLOW_WATER || feat == DNGN_MANGROVE); } static void _pack_default_waves(const coord_def &gc, packed_cell *cell) @@ -290,7 +290,7 @@ static void _pack_default_waves(const coord_def &gc, packed_cell *cell) dungeon_feature_type feat = env.map_knowledge(gc).feat(); // Treat trees in Swamp as though they were shallow water. - if (cell->swamp_tree_water && feat == DNGN_TREE) + if (cell->mangrove_water && feat == DNGN_TREE) feat = DNGN_SHALLOW_WATER; if (!feat_is_water(feat) && !feat_is_lava(feat) || env.grid_colours(gc)) |