diff options
| author | Charles Otto <ottochar@gmail.com> | 2009-11-13 00:51:56 -0500 |
|---|---|---|
| committer | Charles Otto <ottochar@gmail.com> | 2009-11-13 00:51:56 -0500 |
| commit | e7d888537c4d178a98e2ef1727a84d5132655d6c (patch) | |
| tree | 79fc6a8cb3a521b7c4d6a9f8fb761a12c7d6ed23 /crawl-ref/source/view.cc | |
| parent | 4a7b398e339f0b55ae3ce579a02c81c2c281216d (diff) | |
| parent | 8075717d132ff61257a8836ce7854f71f1eb05f8 (diff) | |
| download | crawl-ref-e7d888537c4d178a98e2ef1727a84d5132655d6c.tar.gz crawl-ref-e7d888537c4d178a98e2ef1727a84d5132655d6c.zip | |
Merge spore experiments branch.
Diffstat (limited to 'crawl-ref/source/view.cc')
| -rw-r--r-- | crawl-ref/source/view.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 092ac802d3..648141b7a3 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -133,14 +133,13 @@ void monster_grid_updates() handle_monster_shouts(*mi); } + fedhas_neutralise(monster); if (!mi->visible_to(&you)) continue; - good_god_follower_attitude_change(*mi); - beogh_follower_convert(*mi); - slime_convert(*mi); - fedhas_neutralise(*mi); - + good_god_follower_attitude_change(monster); + beogh_follower_convert(monster); + slime_convert(monster); // XXX: Probably quite hackish. Allows for monsters going berserk when // they see the player. Currently only used for Duvessa, see the // function _elven_twin_dies in mon-stuff.cc. |