diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-09 22:55:07 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-09 22:55:07 +0000 |
commit | 63e5b1bafd275d026018ec9b10c1587799bb4609 (patch) | |
tree | 319871da6fb68d15f7a6f35c1824d42478757a76 /crawl-ref/source/spells3.cc | |
parent | ec077252cc68a6d9bc9a99bd927dd7d860758cf5 (diff) | |
download | crawl-ref-63e5b1bafd275d026018ec9b10c1587799bb4609.tar.gz crawl-ref-63e5b1bafd275d026018ec9b10c1587799bb4609.zip |
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
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r-- | crawl-ref/source/spells3.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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)) { |