diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 07:35:21 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 07:35:21 +0000 |
| commit | 3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c (patch) | |
| tree | 1f96f1cc676d4387d344ebce36a4f455e73d2f72 /crawl-ref/source/mon-util.cc | |
| parent | 7b6e06e7dfb876a56c99e2216a6071e0a652caf9 (diff) | |
| download | crawl-ref-3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c.tar.gz crawl-ref-3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c.zip | |
Apply r6620, r6624, r6625, r6628 and r6632 to 0.4.
Save existing ghosts back to bones files even for undead players.
Fix HP bar blanking out when wrapping.
Fix TSO regarding attacks on evil creatures as unchivalric.
Fix Twisted Resurrection abominations not counting as undead.
Fix monsters being generated with stacks of returning weapons.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6666 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 763364d943..62f1beff85 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -374,15 +374,9 @@ static int _scan_mon_inv_randarts( const monsters *mon, // Twisted Resurrection. static bool _mons_your_abomination(const monsters *mon) { - if (mon->type != MONS_ABOMINATION_SMALL - && mon->type != MONS_ABOMINATION_LARGE) - { - return (false); - } - - // XXX: Reusing the colour scheme - hacky! (jpeg) - return (mon->number == BROWN || mon->number == RED - || mon->number == LIGHTRED); + return ((mon->type == MONS_ABOMINATION_SMALL + || mon->type == MONS_ABOMINATION_LARGE) + && testbits(mon->flags, MF_CREATED_FRIENDLY)); } mon_holy_type mons_holiness(const monsters *mon) |