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/mon-cast.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/mon-cast.cc')
| -rw-r--r-- | crawl-ref/source/mon-cast.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index a9535cea2e..0c78d3e7ef 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -1896,7 +1896,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, for (adjacent_iterator ai(monster->pos()); ai; ++ai) { // we can blink away the crowd, but only our allies - if (mgrd(*ai) != NON_MONSTER + if (monster_at(*ai) && monster_at(*ai)->attitude != monster->attitude) sumcount++; if (grd(*ai) != DNGN_FLOOR && grd(*ai) > DNGN_MAX_NONREACH @@ -1915,13 +1915,13 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, sumcount = 0; for (adjacent_iterator ai(monster->pos()); ai; ++ai) { - if (mgrd(*ai) != NON_MONSTER && monster_at(*ai) != monster) + if (monster_at(*ai) && monster_at(*ai) != monster) { monster_at(*ai)->blink(); - if (mgrd(*ai) != NON_MONSTER) + if (monster_at(*ai)) { monster_at(*ai)->teleport(true); - if (mgrd(*ai) != NON_MONSTER) + if (monster_at(*ai)) continue; } } |