From 4c86a4c178ac599a17f865b6dcce84d2631eae8f Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Sun, 13 Dec 2009 19:56:17 +0100 Subject: Don't disallow trap disarming if there's a harmless cloud in the way. --- crawl-ref/source/main.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/main.cc') diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 275c660f20..d84d27aac4 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -3188,7 +3188,10 @@ static bool _untrap_target(const coord_def move, bool check_confused) mpr("You can't disarm traps in your present form."); return (true); } - if (env.cgrid(target) != EMPTY_CLOUD) + + const int cloud = env.cgrid(target); + if (cloud != EMPTY_CLOUD + && is_damaging_cloud(env.cloud[ cloud ].type, true)) { mpr("You can't get to that trap right now."); return (true); -- cgit v1.2.3-54-g00ecf