summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2010-01-11 09:55:21 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2010-01-11 09:55:57 +1000
commitb62a72ee0d297f09ef26873fde74c140339736ea (patch)
tree7e1180207301b0f0da0a149d096692dacc862e3a
parent2ec2ff85d8907ce3b44ed8b54d300f5c9bd32125 (diff)
downloadcrawl-ref-b62a72ee0d297f09ef26873fde74c140339736ea.tar.gz
crawl-ref-b62a72ee0d297f09ef26873fde74c140339736ea.zip
Make haloes interact sanely with gloom.
-rw-r--r--crawl-ref/source/cloud.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc
index d4c35f363c..50e27a3fd2 100644
--- a/crawl-ref/source/cloud.cc
+++ b/crawl-ref/source/cloud.cc
@@ -12,6 +12,7 @@
#include "externs.h"
+#include "areas.h"
#include "branch.h"
#include "cloud.h"
#include "colour.h"
@@ -237,6 +238,9 @@ void manage_clouds()
if (env.cloud[env.cgrid(*ai)].type == CLOUD_GLOOM)
count++;
+ if (!haloers(cloud.pos).empty() && !silenced(cloud.pos))
+ count = 0;
+
if (count < 4)
dissipate *= 50;
else