diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-13 00:47:33 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-13 00:47:33 +0000 |
| commit | 412bcd6e779cd3883bc5c6ce29a8e79ad32c63f4 (patch) | |
| tree | 45316891325a63a834b5baef43896e464ed8fedb /crawl-ref/source/files.cc | |
| parent | 2dd4fe4a7f0b809a9f3a565f64ed6b5dcb1ab814 (diff) | |
| download | crawl-ref-412bcd6e779cd3883bc5c6ce29a8e79ad32c63f4.tar.gz crawl-ref-412bcd6e779cd3883bc5c6ce29a8e79ad32c63f4.zip | |
Remove a great many cases where mgrd is accessed directly in favour
of monster_at().
The hope is to eventually remove mgrd completely (in favour of scanning
through the monster list, or a different datastructure which gets updated
automatically when monsters move), and thus fix all the mgrd-out-of-sync
bugs in one fell swoop.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9056 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/files.cc')
| -rw-r--r-- | crawl-ref/source/files.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index ae58bc66d8..10833e6141 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -962,11 +962,10 @@ static void _grab_followers() // Handle nearby ghosts. for (adjacent_iterator ai; ai; ++ai) { - if (mgrd(*ai) == NON_MONSTER) + monsters *fmenv = monster_at(*ai); + if (fmenv == NULL) continue; - monsters *fmenv = &menv[mgrd(*ai)]; - if (fmenv->type == MONS_PLAYER_GHOST && fmenv->hit_points < fmenv->max_hit_points / 2) { |