From b55ef796dac12067dc52d7adeb4bb60a97051972 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 5 Nov 2009 18:47:11 -0600 Subject: Since all unholy monsters are considered evil, remove mons_is_evil_or_unholy(), and replace it with monsters::is_evil(). --- crawl-ref/source/monstuff.cc | 6 +++--- 1 file changed, 3 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 6c65a4a923..737a5bce24 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1605,7 +1605,7 @@ int monster_die(monsters *monster, killer_type killer, || (!created_friendly && gives_xp && (you.religion == GOD_MAKHLEB || you.religion == GOD_SHINING_ONE - && mons_is_evil_or_unholy(monster)) + && monster->is_evil()) && !player_under_penance() && random2(you.piety) >= piety_breakpoint(0))) { @@ -1621,7 +1621,7 @@ int monster_die(monsters *monster, killer_type killer, && (you.religion == GOD_MAKHLEB || you.religion == GOD_VEHUMET || you.religion == GOD_SHINING_ONE - && mons_is_evil_or_unholy(monster)) + && monster->is_evil()) && !player_under_penance() && random2(you.piety) >= piety_breakpoint(0)) { @@ -1836,7 +1836,7 @@ int monster_die(monsters *monster, killer_type killer, } if (you.religion == GOD_SHINING_ONE - && mons_is_evil_or_unholy(monster) + && monster->is_evil() && !player_under_penance() && random2(you.piety) >= piety_breakpoint(0) && !invalid_monster_index(killer_index)) -- cgit v1.2.3-54-g00ecf