Limit cloud spells to caster's LOS.

crawl · Dec 15, 2013 · 8ebc43e · 8ebc43e
1 parent 3381686
commit 8ebc43e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
@@ -710,7 +710,7 @@ void apply_area_cloud(cloud_func func, const coord_def& where,
     if (number <= 0)
         return;
 
-    targetter_cloud place(0, 0, number, number);
+    targetter_cloud place(agent, GDM, number, number);
     if (!place.set_aim(where))
         return;
     unsigned int dist = 0;

diff --git a/crawl-ref/source/target.cc b/crawl-ref/source/target.cc
@@ -571,6 +571,9 @@ bool targetter_cloud::set_aim(coord_def a)
             for (adjacent_iterator ai(c); ai; ++ai)
                 if (_cloudable(*ai) && !seen.count(*ai))
                 {
+                    if (agent && !cell_see_cell(*ai, agent->pos(), LOS_NO_TRANS))
+                        continue;
+
                     unsigned int d2 = d1 + ((*ai - c).abs() == 1 ? 5 : 7);
                     if (d2 >= queue.size())
                         queue.resize(d2 + 1);