diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 17:49:06 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 17:49:06 +0000 |
| commit | f61a531950d1396bfd209007c5f53b399830ff39 (patch) | |
| tree | c1eafdb5205538710d6847891edb46b71ed17e6d /crawl-ref/source/mon-util.cc | |
| parent | b6cca042b477db47ddbe2daaf7a38b477483bb79 (diff) | |
| download | crawl-ref-f61a531950d1396bfd209007c5f53b399830ff39.tar.gz crawl-ref-f61a531950d1396bfd209007c5f53b399830ff39.zip | |
Simplify further.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5884 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 7 |
1 files changed, 2 insertions, 5 deletions
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); } |