Fix more monster placement problems: After falling down shafts, if the

monsters weren't placed near the player, they'd all be placed at the 
same location, causing "floating monster" errors.  Place them all *near* 
that same location instead, and check for terrain the monster can 
inhabit instead of just floor.


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

1 files changed, 5 insertions, 9 deletions

diff --git a/crawl-ref/source/mtransit.cc b/crawl-ref/source/mtransit.cc
index d43ad22022..5ce6d678a0 100644
--- a/crawl-ref/source/mtransit.cc
+++ b/crawl-ref/source/mtransit.cc
@@ -262,16 +262,12 @@ bool follower::place(bool near_player)
                 dgn_find_nearby_stair(DNGN_ESCAPE_HATCH_DOWN,
                                       m.pos(), true);
 
-            if (monster_habitable_grid(&m, grd(where_to_go)))
+            if (where_to_go == you.pos())
+                near_player = true;
+            else if (m.find_home_near_place(where_to_go))
             {
-                if (where_to_go == you.pos())
-                    near_player = true;
-                else
-                {
-                    m.moveto(where_to_go);
-                    mgrd(where_to_go) = m.mindex();
-                    placed = true;
-                }
+                mgrd(m.pos()) = m.mindex();
+                placed = true;
             }
         }