diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-12 16:08:07 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-12 16:08:07 +0000 |
| commit | 9bf7968e807d3d734e25986ca8591c1fcc833b7e (patch) | |
| tree | 210c86d61c8f5f7e91f3632806a92c514eeef770 /crawl-ref/source/monstuff.cc | |
| parent | 9fe5cb50e54441eb1d7e6376a612f8c771b59f9c (diff) | |
| download | crawl-ref-9bf7968e807d3d734e25986ca8591c1fcc833b7e.tar.gz crawl-ref-9bf7968e807d3d734e25986ca8591c1fcc833b7e.zip | |
Reenable collateral kills for Beogh; they were disabled when orc
followers were changed to no longer get the "god gift" flag (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3609 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 81259892d7..c030aa2b15 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -767,8 +767,8 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) true, monster); // Trying to prevent summoning abuse here, so we're trying to - // prevent summoned creatures from being being done_good kills. - // Only affects creatures which were friendly when summoned. + // prevent summoned creatures from being done_good kills. Only + // affects creatures which were friendly when summoned. if (!testbits(monster->flags, MF_CREATED_FRIENDLY) && gives_xp && pet_kill) { @@ -787,7 +787,9 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) } else if (you.religion == GOD_VEHUMET || you.religion == GOD_MAKHLEB - || (!anon && testbits( menv[i].flags, MF_GOD_GIFT ))) + || (you.religion == GOD_BEOGH + && mons_species(menv[i].type) == MONS_ORC) + || (!anon && testbits(menv[i].flags, MF_GOD_GIFT))) { // Yes, we are splitting undead pets from the others // as a way to focus Necromancy vs Summoning (ignoring |