diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 12:57:13 -0600 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-05 12:57:13 -0600 |
| commit | 51ded013829b4cd8f73fa7f6313e73d2f7550aa5 (patch) | |
| tree | 58a2f3973efdd6fb016f3ab7a3a71809d0d888d0 /crawl-ref/source/monplace.cc | |
| parent | 418a2664a3de915971c847d9fb16e93bc263661e (diff) | |
| download | crawl-ref-51ded013829b4cd8f73fa7f6313e73d2f7550aa5.tar.gz crawl-ref-51ded013829b4cd8f73fa7f6313e73d2f7550aa5.zip | |
Make many checks for monster (non)existence on squares use monster_at().
Not all are changed yet, as there are several index checks still needed
for debugging purposes.
Also, make many checks for player/monster (non)existence use actor_at().
Diffstat (limited to 'crawl-ref/source/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 0bfa4d2897..77b31695f5 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -1047,7 +1047,7 @@ static int _place_monster_aux(const mgen_data &mg, return (-1); } - ASSERT(mgrd(fpos) == NON_MONSTER); + ASSERT(!monster_at(fpos)); if (crawl_state.arena && arena_veto_place_monster(mg, first_band_member, fpos)) |