diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-13 20:17:09 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-13 20:19:46 -0800 |
| commit | b0fe954dbafe8e794e1675e76939b4e4b46508a5 (patch) | |
| tree | ff7387ab360157dc7f1305b14516a0913767dbfc /crawl-ref/source/mon-place.cc | |
| parent | 32aea1bdf11b95696e7d071acc5c7a2a6f610d1c (diff) | |
| download | crawl-ref-b0fe954dbafe8e794e1675e76939b4e4b46508a5.tar.gz crawl-ref-b0fe954dbafe8e794e1675e76939b4e4b46508a5.zip | |
mon-place.cc: assert if summoner is dead...
... and mg.non_actor_summoner is empty.
Diffstat (limited to 'crawl-ref/source/mon-place.cc')
| -rw-r--r-- | crawl-ref/source/mon-place.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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<monsters*>(mg.summoner); blame.get_vector().push_back(blame_prefix + sum->full_name(DESC_NOCAP_A, true)); |