Disambiguate the LOS_SOLID confusion.

Its name suggests it's about line of effect, while in fact it's both effect
and sight.  Thus, I've split its uses into LOS_SOLID and LOS_SOLID_SEE -- the
former is what LOS_SOLID was usually understood to mean, the latter is what it
actually was (being targettable with an arrow/beam).

The difference is: LOS_SOLID_SEE obeys clouds.

The name of the latter is abysmal -- if you have a better idea, please sed.

1 files changed, 10 insertions, 3 deletions

diff --git a/crawl-ref/source/losparam.cc b/crawl-ref/source/losparam.cc
index 93518ce1e2..866d17b147 100644
--- a/crawl-ref/source/losparam.cc
+++ b/crawl-ref/source/losparam.cc
@@ -84,17 +84,24 @@ opacity_type opacity_immob::operator()(const coord_def& p) const
         return base;
 }
 
+opacity_type opacity_solid::operator()(const coord_def& p) const
+{
+    dungeon_feature_type f = env.grid(p);
+    if (feat_is_solid(f))
+        return OPC_OPAQUE;
+
+    return OPC_CLEAR;
+}
+
 // Make anything solid block in addition to normal LOS.
 // That's just granite statues in addition to opacity_no_trans.
-opacity_type opacity_solid::operator()(const coord_def& p) const
+opacity_type opacity_solid_see::operator()(const coord_def& p) const
 {
     dungeon_feature_type f = env.grid(p);
     if (feat_is_solid(f))
         return OPC_OPAQUE;
     else if (is_opaque_cloud(env.cgrid(p)))
         return OPC_HALF;
-    else if (f == DNGN_TREE || f == DNGN_SWAMP_TREE)
-        return OPC_HALF;
     else if (const monster *mon = monster_at(p))
         return mons_opacity(mon);