Clean up opacity_no_trans a bit.

Base it on opc_default, and consider trees as transparent walls.

opacity_no_trans currently affects a variety of things
(translocations like blink/apport/portalproj, feeling safe,
trap detection); it would be nice to separate these eventually.
(cherry picked from commit 48b4f875decad6312c738ee4ffdb6bddbaa9a9cb)

1 files changed, 4 insertions, 9 deletions

diff --git a/crawl-ref/source/losparam.cc b/crawl-ref/source/losparam.cc
index ff53d43543..7bbfa5ac3e 100644
--- a/crawl-ref/source/losparam.cc
+++ b/crawl-ref/source/losparam.cc
@@ -38,20 +38,15 @@ opacity_type opacity_fullyopaque::operator()(const coord_def& p) const
         return OPC_CLEAR;
 }
 
-// Make transparent walls block in addition to normal LOS.
 opacity_type opacity_no_trans::operator()(const coord_def& p) const
 {
+    opacity_type base = opc_default(p);
+
     dungeon_feature_type f = env.grid(p);
-    if (feat_is_opaque(f) || feat_is_wall(f))
+    if (feat_is_opaque(f) || feat_is_wall(f) || f == DNGN_TREES)
         return OPC_OPAQUE;
-    else if (is_opaque_cloud(env.cgrid(p)))
-        return OPC_HALF;
-    else if (f == DNGN_TREES)
-        return OPC_HALF;
-    else if (monster_at(p) && monster_at(p)->type == MONS_BUSH)
-        return OPC_HALF;
     else
-        return OPC_CLEAR;
+        return base;
 }
 
 // Make anything solid block in addition to normal LOS.