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/abyss.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/abyss.cc')
| -rw-r--r-- | crawl-ref/source/abyss.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc index c7d96b3b6d..db0a527fec 100644 --- a/crawl-ref/source/abyss.cc +++ b/crawl-ref/source/abyss.cc @@ -496,7 +496,7 @@ void area_shift(void) move_item_stack_to_grid(*ri, newpos); // Move monster. - if (mgrd(*ri) != NON_MONSTER) + if (monster_at(*ri)) { menv[mgrd(*ri)].moveto(newpos); mgrd(newpos) = mgrd(*ri); @@ -569,7 +569,7 @@ void abyss_teleport( bool new_area ) if ((grd(newspot) == DNGN_FLOOR || grd(newspot) == DNGN_SHALLOW_WATER) - && mgrd(newspot) == NON_MONSTER + && !monster_at(newspot) && env.cgrid(newspot) == EMPTY_CLOUD) { found = true; |