diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-18 16:09:33 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-18 16:09:33 +0000 |
| commit | 752bd3be6f5bf7bd5a8509e036f2d8a6c5c75e77 (patch) | |
| tree | 381e398384f1b3f57c76c665bf1b6898f0623d62 /crawl-ref/source/religion.cc | |
| parent | fdb1f24de9d264bac9001fd211ddb1a1ee7bc3dd (diff) | |
| download | crawl-ref-752bd3be6f5bf7bd5a8509e036f2d8a6c5c75e77.tar.gz crawl-ref-752bd3be6f5bf7bd5a8509e036f2d8a6c5c75e77.zip | |
Add a few more follower-related cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5947 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 2811311f70..874934a436 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1072,7 +1072,8 @@ static void _give_nemelex_gift() bool is_orcish_follower(const monsters* mon) { return (mon->alive() && mons_species(mon->type) == MONS_ORC - && mons_friendly(mon) && mons_is_god_gift(mon, GOD_BEOGH)); + && mon->attitude == ATT_FRIENDLY + && mons_is_god_gift(mon, GOD_BEOGH)); } bool is_good_lawful_follower(const monsters* mon) @@ -4453,7 +4454,7 @@ static bool _beogh_followers_abandon_you() for (int x = xstart; x <= xend; ++x) { const unsigned short targ_monst = mgrd[x][y]; - if ( targ_monst != NON_MONSTER ) + if (targ_monst != NON_MONSTER) { monsters *monster = &menv[targ_monst]; if (is_orcish_follower(monster)) @@ -4476,7 +4477,6 @@ static bool _beogh_followers_abandon_you() } monster->attitude = ATT_HOSTILE; - monster->del_ench(ENCH_CHARM, true); behaviour_event(monster, ME_ALERT, MHITYOU); // For now CREATED_FRIENDLY stays. |