diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-20 14:50:49 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-20 14:50:49 +0000 |
| commit | c102112f5aaf9e8102352111f15f4d04fe185383 (patch) | |
| tree | e1b51b0f855232e04f65a71ea8b2db6a4d12e076 /crawl-ref | |
| parent | 31d689b8a618f671f7ef6bf3e3270d471853c26f (diff) | |
| download | crawl-ref-c102112f5aaf9e8102352111f15f4d04fe185383.tar.gz crawl-ref-c102112f5aaf9e8102352111f15f4d04fe185383.zip | |
Readd checks for randomly chosen monsters' being alive (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3746 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/xom.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 1011c773e9..b68a938e2b 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3302,7 +3302,7 @@ void beogh_convert_orc(monsters *orc, bool emergency, bool is_orcish_follower(const monsters* mon) { - return (mons_species(mon->type) == MONS_ORC + return (mon->alive() && mons_species(mon->type) == MONS_ORC && mon->attitude == ATT_FRIENDLY); } diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 53c388073c..3c7b0824ec 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -413,7 +413,8 @@ bool there_are_monsters_nearby() static bool choose_mutatable_monster(const monsters* mon) { - return (mons_holiness(mon) == MH_NATURAL && !mons_is_submerged(mon)); + return (mon->alive() && mons_holiness(mon) == MH_NATURAL + && !mons_is_submerged(mon)); } static monster_type xom_random_demon(int sever, bool use_greater_demons = true) |