From f61a531950d1396bfd209007c5f53b399830ff39 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 16 Jun 2008 17:49:06 +0000 Subject: Simplify further. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5884 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mon-util.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/mon-util.cc') diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index a4284fd41b..e6930fad96 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2043,11 +2043,8 @@ bool mons_aligned(int m1, int m2) bool mons_atts_aligned(mon_attitude_type fr1, mon_attitude_type fr2) { - if (fr1 == ATT_GOOD_NEUTRAL) - fr1 = ATT_FRIENDLY; - - if (fr2 == ATT_GOOD_NEUTRAL) - fr2 = ATT_FRIENDLY; + if (mons_att_wont_attack(fr1) && mons_att_wont_attack(fr2)) + return (true); return (fr1 == fr2); } -- cgit v1.2.3-54-g00ecf