diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-05 13:27:28 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-05 13:27:28 +0000 |
| commit | 086e548103eed62bf4d1bb806e2bec88562fbfe6 (patch) | |
| tree | 26eefe5832d5be81387b3222338fdc6765efa31b /crawl-ref/source/view.cc | |
| parent | 9905c3fa45641105522041cb9cf4bfa6625845d5 (diff) | |
| download | crawl-ref-086e548103eed62bf4d1bb806e2bec88562fbfe6.tar.gz crawl-ref-086e548103eed62bf4d1bb806e2bec88562fbfe6.zip | |
Fix 2011201: Disallow summoned orcs from joining a worshipper of Beogh.
Fix 2011258: Consolidate named orcs correctly in the monster list.
Fix 2010542: Patrolling monsters forgetting the player too quickly.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6408 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/view.cc')
| -rw-r--r-- | crawl-ref/source/view.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 3f8c65f2eb..2a4176acc1 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -833,6 +833,7 @@ void beogh_follower_convert(monsters *monster, bool orc_hit) if (you.religion == GOD_BEOGH && monster->foe == MHITYOU && mons_species(monster->type) == MONS_ORC + && !mons_is_summoned(monster) && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) && !mons_friendly(monster) && mons_player_visible(monster) && !mons_is_sleeping(monster) |