From 63e5b1bafd275d026018ec9b10c1587799bb4609 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sun, 9 Nov 2008 22:55:07 +0000 Subject: For consistency, rename _is_animatable_corpse() to _animatable_remains(). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7430 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells3.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/spells3.cc') diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 3a8dd37bf3..69dfda1077 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -623,7 +623,7 @@ bool cast_summon_horrible_things(int pow, god_type god) return (false); } -static bool _is_animatable_corpse(const item_def& item) +static bool _animatable_remains(const item_def& item) { return (item.base_type == OBJ_CORPSES && mons_class_can_be_zombified(item.plus)); @@ -785,7 +785,7 @@ static bool _raise_corpse(const coord_def &a, int corps, beh_type beha, { const item_def& item = mitm[corps]; - if (!_is_animatable_corpse(item)) + if (!_animatable_remains(item)) return (false); if (!actual) @@ -857,7 +857,7 @@ bool animate_remains(const coord_def &a, corpse_type class_allowed, // Search all the items on the ground for a corpse. for (stack_iterator si(a); si; ++si) { - if (_is_animatable_corpse(*si) + if (_animatable_remains(*si) && (class_allowed == CORPSE_BODY || si->sub_type == CORPSE_SKELETON)) { -- cgit v1.2.3-54-g00ecf