From ea22cd80a5344cd61b27cb1246ff741a5c6829c4 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Sun, 20 Dec 2009 23:02:35 +0100
Subject: Make the "killing friend" conduct, slouch and swapping place treat
 projectiles as non-monsters.

---
 crawl-ref/source/mon-stuff.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'crawl-ref/source/mon-stuff.cc')

diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 76f964fe20..974188694a 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -2815,6 +2815,13 @@ bool swap_check(monsters *monster, coord_def &loc, bool quiet)
         return (false);
     }
 
+    if (mons_is_projectile(monster->type))
+    {
+        if (!quiet)
+            mpr("It's unwise to walk into this.");
+        return (false);
+    }
+
     if (monster->caught())
     {
         if (!quiet)
-- 
cgit v1.2.3-54-g00ecf