Extend monster pathfinding to monsters circumventing pools of deep water

or lava. I've added some more checks to avoid hampering performance too
much, but of course there's still space for improvement.

Once per turn check whether the player can see water and/or lava, and
only if this is the case run the additional checks (monster habitat,
grid_see_grid) when a monster tries to move.
Smart monsters that have a ranged attack won't use pathfinding either
since they can directly fire at the player. (This is identical to their
pre-pathfinding behaviour.)

Also fix butterflies really not interrupting resting. (Setting it to 0
doesn't work for some reason.)


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5737 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 1 deletions

diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index e20fa68c02..b5bc41741b 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -397,7 +397,8 @@ bool give_monster_proper_name(monsters *mon, bool orcs_only = true);
 flight_type mons_class_flies(int mc);
 flight_type mons_flies(const monsters *mon);
 
-bool mons_amphibious(int mc);
+bool mons_class_amphibious(int mc);
+bool mons_amphibious(const monsters *mon);
 
 // last updated XXmay2000 {dlb}
 /* ***********************************************************************