From 9bf7968e807d3d734e25986ca8591c1fcc833b7e Mon Sep 17 00:00:00 2001 From: dolorous Date: Wed, 12 Mar 2008 16:08:07 +0000 Subject: 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 --- crawl-ref/source/monstuff.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/monstuff.cc') 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 -- cgit v1.2.3-54-g00ecf