From b0fe954dbafe8e794e1675e76939b4e4b46508a5 Mon Sep 17 00:00:00 2001 From: Matthew Cline Date: Fri, 13 Nov 2009 20:17:09 -0800 Subject: mon-place.cc: assert if summoner is dead... ... and mg.non_actor_summoner is empty. --- crawl-ref/source/mon-place.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/mon-place.cc') diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc index 4e8bde2885..4f8897c6eb 100644 --- a/crawl-ref/source/mon-place.cc +++ b/crawl-ref/source/mon-place.cc @@ -1315,6 +1315,8 @@ static int _place_monster_aux(const mgen_data &mg, // by the Fire Storm spell). else if (mg.summoner != NULL && mg.summoner->alive()) { + ASSERT(mg.summoner->alive()); + CrawlStoreValue& blame = mon->props["blame"]; blame.new_vector(SV_STR, SFLAG_CONST_TYPE); @@ -1325,7 +1327,7 @@ static int _place_monster_aux(const mgen_data &mg, } else { - monsters* sum = &menv[mg.summoner->mindex()]; + monsters* sum = dynamic_cast(mg.summoner); blame.get_vector().push_back(blame_prefix + sum->full_name(DESC_NOCAP_A, true)); -- cgit v1.2.3-54-g00ecf