diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-30 04:03:42 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-30 04:03:42 +0000 |
| commit | 402916d9a9b7cbeafde89ef815ec9205262edebe (patch) | |
| tree | 98faaf2b48dc42c54f9bcac4a6caf004e0c765c5 /crawl-ref/source/mstuff2.cc | |
| parent | 7beeddfca47ed76fe6c605a45d21079ed38a4dfe (diff) | |
| download | crawl-ref-402916d9a9b7cbeafde89ef815ec9205262edebe.tar.gz crawl-ref-402916d9a9b7cbeafde89ef815ec9205262edebe.zip | |
Simplify yet again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6237 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mstuff2.cc')
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index e7bb469645..578172eec5 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -1014,11 +1014,8 @@ void monster_teleport(monsters *monster, bool instan, bool silent) continue; } - if (is_sanctuary(newx, newy) && !mons_friendly(monster) - && !mons_good_neutral(monster)) - { + if (is_sanctuary(newx, newy) && !mons_wont_attack(monster)) continue; - } if (monster_habitable_grid(monster, grd[newx][newy])) break; |