summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-stuff.cc
diff options
context:
space:
mode:
authorCharles Otto <ottochar@gmail.com>2009-11-13 13:56:43 -0500
committerCharles Otto <ottochar@gmail.com>2009-11-13 13:58:10 -0500
commit5aba0fa49e632d5f61d3489263f36dde4a74dfad (patch)
tree8ae1224a2f1b7ded903e176e6245f9f057028365 /crawl-ref/source/mon-stuff.cc
parentc27779f9fc2954eb86537e540644a20212fd22ad (diff)
downloadcrawl-ref-5aba0fa49e632d5f61d3489263f36dde4a74dfad.tar.gz
crawl-ref-5aba0fa49e632d5f61d3489263f36dde4a74dfad.zip
Change ballistomycete messaging
Drop the deactivation message, simplify and change the activation messaging.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
-rw-r--r--crawl-ref/source/mon-stuff.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 8ba89a64fb..4b0114d5ee 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -1046,7 +1046,7 @@ static bool _spore_goes_pop(monsters *monster, killer_type killer,
// FIXME: show_more == mons_near(monster)
beam.explode();
- activate_ballistomycetes(monster);
+ activate_ballistomycetes(monster, beam.target);
// Monster died in explosion, so don't re-attach it to the grid.
return (true);
}
@@ -1433,9 +1433,6 @@ int monster_die(monsters *monster, killer_type killer,
you.remove_beholder(monster);
- if(monster->type == MONS_BALLISTOMYCETE)
- activate_ballistomycetes(monster);
-
// Clear auto exclusion now the monster is killed -- if we know about it.
if (mons_near(monster) || wizard)
remove_auto_exclude(monster);
@@ -2088,6 +2085,9 @@ int monster_die(monsters *monster, killer_type killer,
_mummy_curse(monster, killer, killer_index);
}
+ if(monster->type == MONS_BALLISTOMYCETE)
+ activate_ballistomycetes(monster, monster->pos());
+
if (!wizard && !submerged)
_monster_die_cloud(monster, !mons_reset, silent, summoned);