From 223f7f7080ce49ca31b7653a7922c3cf9a92727c Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 9 Nov 2008 23:38:14 +0000 Subject: Simplify handling of monsters without skeletons. Note that monsters that have skeletons, but cannot be zombified, will now leave skeletons after their corpses rot. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7432 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mon-util.cc | 8 +------- crawl-ref/source/spells2.cc | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 8019db9368..e7feff2411 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1400,13 +1400,7 @@ bool mons_has_lifeforce(const monsters *mon) bool mons_skeleton(int mc) { - if (!mons_class_can_be_zombified(mc) - || mons_class_flag(mc, M_NO_SKELETON)) - { - return (false); - } - - return (true); + return (!mons_class_flag(mc, M_NO_SKELETON)); } flight_type mons_class_flies(int mc) diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 91d1a09b74..379ac587a4 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -235,7 +235,7 @@ int corpse_rot(int pow) { if (si->base_type == OBJ_CORPSES && si->sub_type == CORPSE_BODY) { - // Found a corpse. Skeletify it if possible. + // Found a corpse. Skeletonise it if possible. if (!mons_skeleton(si->plus)) destroy_item(si->index()); else -- cgit v1.2.3-54-g00ecf