summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-27 13:38:06 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-27 13:38:06 +0000
commit147f57b8232067ebbd0dd5facf7df58ee3f05ce9 (patch)
tree44c2e1d2c8fd453d63a55c6dc0f73762f3803df7 /crawl-ref/source/monstuff.cc
parent0e6ace1ac92fe52e8a23335ccf68b69056407bbc (diff)
downloadcrawl-ref-147f57b8232067ebbd0dd5facf7df58ee3f05ce9.tar.gz
crawl-ref-147f57b8232067ebbd0dd5facf7df58ee3f05ce9.zip
* Mention the spell's name in the forget_spell() miscast effect.
* Remove a dangling if-statement in monster_die KILL_RESET check. (It really didn't look like it had any purpose, but if I was wrong please correct me.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9257 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
-rw-r--r--crawl-ref/source/monstuff.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 4eebb23670..40909f4101 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1200,9 +1200,10 @@ int monster_die(monsters *monster, killer_type killer,
}
if (!wizard && !mons_reset && !submerged)
+ {
place_cloud(CLOUD_COLD, monster->pos(), 2 + random2(4),
monster->kill_alignment());
-
+ }
if (killer == KILL_RESET)
killer = KILL_DISMISSED;
}
@@ -1595,7 +1596,6 @@ int monster_die(monsters *monster, killer_type killer,
// Monster doesn't die, just goes back to wherever it came from
// This must only be called by monsters running out of time (or
// abjuration), because it uses the beam variables! Or does it???
- if (!wizard)
// KILL_RESET monsters no longer lose their whole inventory, only
// items they were generated with.