diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-07 01:29:44 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-07 01:29:44 +0000 |
| commit | 5406eedd8be938cfe204147314eda3cfbe3f470e (patch) | |
| tree | 6728d6920e1be7c34688834bd8843769d5f03178 /crawl-ref/source/spells4.cc | |
| parent | d0d2ca2bdb3014bdb24fa436cc047b9b3c81dcb4 (diff) | |
| download | crawl-ref-5406eedd8be938cfe204147314eda3cfbe3f470e.tar.gz crawl-ref-5406eedd8be938cfe204147314eda3cfbe3f470e.zip | |
Simplify handling of monsters angered by the player, and expand it to
not allow Trog worshippers to have magic-using followers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4898 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells4.cc')
| -rw-r--r-- | crawl-ref/source/spells4.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 0150125569..0f8e9a7b70 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -718,8 +718,7 @@ static int tame_beast_monsters(int x, int y, int pow, int garbage) monsters *monster = &menv[which_mons]; if (!is_domesticated_animal(monster->type) || mons_friendly(monster) - || (is_good_god(you.religion) - && mons_is_evil_or_unholy(monster))) + || player_angers_monster(monster, false)) { return 0; } |