summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/losparam.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-10-13 09:56:41 +0200
committerAdam Borowski <kilobyte@angband.pl>2009-10-13 09:57:09 +0200
commit7cb4b819399d86effcf5890498f3e89dcb8a7178 (patch)
treed591f28e24caaf7196a93dbf7f02deb727413f9f /crawl-ref/source/losparam.cc
parent072864bdfdb2befa0cb865dbe4234f7f0c8dec39 (diff)
parentffa4e38d65ac1f41a20f3820d38c4d54291c9a8f (diff)
downloadcrawl-ref-7cb4b819399d86effcf5890498f3e89dcb8a7178.tar.gz
crawl-ref-7cb4b819399d86effcf5890498f3e89dcb8a7178.zip
Merge branch 'trees'.
There's still the issue of glyph choice, and cutting them down with an axe is not coded yet.
Diffstat (limited to 'crawl-ref/source/losparam.cc')
-rw-r--r--crawl-ref/source/losparam.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/losparam.cc b/crawl-ref/source/losparam.cc
index 9b83e28b11..833ee04003 100644
--- a/crawl-ref/source/losparam.cc
+++ b/crawl-ref/source/losparam.cc
@@ -92,11 +92,16 @@ unsigned short los_param_base::cloud_idx(const coord_def& p) const
opacity_type los_param_base::opacity(const coord_def& p) const
{
+ int m;
dungeon_feature_type f = feature(p);
if (grid_is_opaque(f))
return OPC_OPAQUE;
else if (is_opaque_cloud(cloud_idx(p)))
return OPC_HALF;
+ else if (f == DNGN_TREES)
+ return OPC_HALF;
+ else if ((m = mgrd(trans(p))) != NON_MONSTER && menv[m].type == MONS_BUSH)
+ return OPC_HALF;
else
return OPC_CLEAR;
}