From 2331200dee057c636ca63980c8c3c2f97fed1163 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 6 Oct 2008 21:10:18 +0000 Subject: Fix inverted logic, and simplify. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7160 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mon-util.cc | 3 ++- crawl-ref/source/monstuff.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 900aad254d..d236ee389c 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -802,7 +802,8 @@ bool mons_is_zombified(const monsters *mon) bool mons_class_can_be_zombified(int mc) { int ms = mons_species(mc); - return (mons_zombie_size(ms) != Z_NOZOMBIE || mons_weight(ms) == 0); + return (mons_zombie_size(ms) != Z_NOZOMBIE + && mons_weight(ms) != 0); } bool mons_can_be_zombified(const monsters *mon) diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index c0cce9d350..2af65b8093 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1057,9 +1057,9 @@ void monster_die(monsters *monster, killer_type killer, } if (you.duration[DUR_DEATH_CHANNEL] - && gives_xp && mons_holiness(monster) == MH_NATURAL - && mons_weight(mons_species(monster->type) > 0)) + && mons_can_be_zombified(monster) + && gives_xp) { const monster_type spectre = mons_species(monster->type); -- cgit v1.2.3-54-g00ecf