summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-20 09:37:00 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-20 09:37:00 +0000
commitbb3b8b8286b84de95546d1121d0c305bbdc85851 (patch)
treec56eaeeca56855ac86631fa37b2b3128784f7fc1 /crawl-ref/source/spells3.cc
parent6452e938ce43d8447bba63a5fcfbaee5e4673baa (diff)
downloadcrawl-ref-bb3b8b8286b84de95546d1121d0c305bbdc85851.tar.gz
crawl-ref-bb3b8b8286b84de95546d1121d0c305bbdc85851.zip
* Fix non-prompting when firing through allies.
* Don't autopickup chunks if starving. (Yes, I died because of that. Xom was very much amused...) * Some spacing fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9668 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index c0c963b25e..2eea4855ff 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -925,7 +925,15 @@ int animate_remains(const coord_def &a, corpse_type class_allowed,
{
// Ignore quiet.
if (was_butchering)
- mpr("The corpse you are butchering rises to attack!");
+ {
+ if (beha == BEH_HOSTILE)
+ mpr("The corpse you are butchering rises to attack!");
+ else
+ {
+ mpr("The corpse you are butchering rises to join "
+ "your ranks!");
+ }
+ }
if (!quiet && see_grid(a))
mpr("The dead are walking!");