diff options
| author | blackcustard <peterwicksstringfield@gmail.com> | 2013-08-19 21:53:48 -0500 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-12-04 18:54:18 -0500 |
| commit | d1885e8d78fc129c20050fabc484bdf724b04148 (patch) | |
| tree | e35757e724efe684591af89555372fa99a83542f /crawl-ref/source/abyss.cc | |
| parent | f0ae6098ef3016ddda80d4e1020a03e67e19e39a (diff) | |
| download | crawl-ref-d1885e8d78fc129c20050fabc484bdf724b04148.tar.gz crawl-ref-d1885e8d78fc129c20050fabc484bdf724b04148.zip | |
Assert when trying to transit dead monsters (#7146)
Also, give a warning and ignore unmarshalled dead monsters on transit
lists.
[Committer's note: Changes from blackcustard's patch:
* Remove the testing hack in Cure Poison.
* Change the warning message in _abyss_wipe_square_at into an ASSERT,
since we have fixed the known bugs that could leave dead starcursed
masses in the grid.
* Use MSGCH_ERROR rather than the in-character MSGCH_WARN for the
warning message in unmarshall_follower_list.
* Make a minor formatting tweak in unmarshall_follower_list.
* Rewrite the commit message. -neil]
Diffstat (limited to 'crawl-ref/source/abyss.cc')
| -rw-r--r-- | crawl-ref/source/abyss.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index af542ea34d..7baca3bbc5 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -635,6 +635,8 @@ static void _abyss_wipe_square_at(coord_def p, bool saveMonsters=false) // Nuke monster. if (monster* mon = monster_at(p)) { + ASSERT(mon->alive()); + if (saveMonsters) _push_displaced_monster(mon); else |