diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-09 08:58:22 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-09 08:58:22 +0000 |
| commit | 52b7f2716d2c217c1c0bbeb43c3c2f11d8e0c87e (patch) | |
| tree | 6da531d3bcc1f9e8ab9cf92d457222d7f3318003 /crawl-ref/source/spells2.cc | |
| parent | bca7bf95401a93f8dfff4595a4d106c03e4d42b1 (diff) | |
| download | crawl-ref-52b7f2716d2c217c1c0bbeb43c3c2f11d8e0c87e.tar.gz crawl-ref-52b7f2716d2c217c1c0bbeb43c3c2f11d8e0c87e.zip | |
[1625227] animate_dead will not affect corpses being butchered.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@811 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 9673214744..fa0348d4ec 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -28,6 +28,7 @@ #include "beam.h" #include "cloud.h" +#include "delay.h" #include "direct.h" #include "dungeon.h" #include "effects.h" @@ -340,7 +341,8 @@ int animate_dead( int power, int corps_beh, int corps_hit, int actual ) // This searches all the items on the ground for a corpse while (objl != NON_ITEM) { - if (mitm[objl].base_type == OBJ_CORPSES) + if (mitm[objl].base_type == OBJ_CORPSES + && !is_being_butchered(mitm[objl])) { number_raised += raise_corpse(objl, adx, ady, corps_beh, corps_hit, actual); |