diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-06 10:27:55 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-06 10:27:55 +0000 |
| commit | 0b83e4380f54f6d75309fa2990f347a8f7658f01 (patch) | |
| tree | 2933a56d2ba1ca87d2f28fb3bb45dac13360ce2a /crawl-ref/source/fight.cc | |
| parent | f739b7d8bb5d57d55a69b93c24bf88dc3299ab21 (diff) | |
| download | crawl-ref-0b83e4380f54f6d75309fa2990f347a8f7658f01.tar.gz crawl-ref-0b83e4380f54f6d75309fa2990f347a8f7658f01.zip | |
Get the arena tied-round and giant spore logic working again, partially by
making self-initiated explosions happen directly in
melee_attack::mons_self_destructs() and by calling arena_monster_died() after
the spore has exploded instead of before.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8268 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index ab4b1a3c9d..6ac9990b9e 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -3819,6 +3819,8 @@ bool melee_attack::mons_self_destructs() if (atk->type == MONS_GIANT_SPORE || atk->type == MONS_BALL_LIGHTNING) { atk->hit_points = -1; + // Do the explosion right now. + monster_die(atk, KILL_MON, atk->mindex()); return (true); } return (false); |