summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/main.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-30 06:59:43 -0400
committerNeil Moore <neil@s-z.org>2014-07-30 06:59:46 -0400
commit4ccbf14a0f29572fe3fb64aaada6e1450c0e90ec (patch)
treeb5ec13c5f5c9705487b5217f94ace5fbfc543e82 /crawl-ref/source/main.cc
parentb5031071af6e5f9561cb85f8762154aca3ec4433 (diff)
downloadcrawl-ref-4ccbf14a0f29572fe3fb64aaada6e1450c0e90ec.tar.gz
crawl-ref-4ccbf14a0f29572fe3fb64aaada6e1450c0e90ec.zip
Let Qazlalites disarm traps beneath their own clouds (#8758)
All the other player-relevant checks in actor_cloud_immune care only about the cloud type, so this isn't an information leak.
Diffstat (limited to 'crawl-ref/source/main.cc')
-rw-r--r--crawl-ref/source/main.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 39ad8b7bc6..2a9239dbf6 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -2551,7 +2551,8 @@ static bool _untrap_target(const coord_def move, bool check_confused)
{
const int cloud = env.cgrid(target);
if (cloud != EMPTY_CLOUD
- && is_damaging_cloud(env.cloud[cloud].type, true))
+ && is_damaging_cloud(env.cloud[cloud].type, true)
+ && !actor_cloud_immune(&you, env.cloud[cloud]))
{
mpr("You can't get to that trap right now.");
return true;