summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-act.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-06-19 03:55:34 -0400
committerNeil Moore <neil@s-z.org>2014-06-19 04:06:44 -0400
commitd15dadc4ff1ff93b879ee7825aacf3146055ed64 (patch)
tree2a7c32497d57acd7688a2a31cfeea83fd2664e02 /crawl-ref/source/mon-act.cc
parent816628f367e3fed272dfc32b60fe7abc03bf245a (diff)
downloadcrawl-ref-d15dadc4ff1ff93b879ee7825aacf3146055ed64.tar.gz
crawl-ref-d15dadc4ff1ff93b879ee7825aacf3146055ed64.zip
Make Mara's summoned clones time out when he dies.
Clones from chaos melee are not affected, but would be easy enough to change. Perhaps temporary clones could actually be is_summoned?
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
-rw-r--r--crawl-ref/source/mon-act.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc
index 0777aff19e..cfcb3af113 100644
--- a/crawl-ref/source/mon-act.cc
+++ b/crawl-ref/source/mon-act.cc
@@ -1682,7 +1682,9 @@ static void _pre_monster_move(monster* mons)
}
}
- if (mons->summoner && mons->is_summoned())
+ int sumtype = 0;
+ if (mons->summoner && (mons->is_summoned(NULL, &sumtype)
+ || sumtype == MON_SUMM_CLONE))
{
const actor * const summoner = actor_by_mid(mons->summoner);
if ((!summoner || !summoner->alive()) && mons->del_ench(ENCH_ABJ))