summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-08-16 21:04:38 -0400
committerJesse Luehrs <doy@tozt.net>2014-08-16 21:04:38 -0400
commit2075953fc072498afb8f04aef691d499cb30490e (patch)
tree17658839c9da7234aed2f958f21aa1605e9c52e0
parent0f3837eba8c8ccdc3414111f6f6312c6ffce6a15 (diff)
downloadcrawl-ref-2075953fc072498afb8f04aef691d499cb30490e.tar.gz
crawl-ref-2075953fc072498afb8f04aef691d499cb30490e.zip
don't warn when stumbling around near friendly plants (7333)
-rw-r--r--crawl-ref/source/main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 803873874b..67108afb66 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -3147,7 +3147,9 @@ static void _move_player(coord_def move)
{
string suffix, adj;
monster *mons = monster_at(*ai);
- if (mons && bad_attack(mons, adj, suffix, penance))
+ if (mons
+ && !fedhas_passthrough(mons)
+ && bad_attack(mons, adj, suffix, penance))
{
bad_mons = mons;
bad_suff = suffix;