[1838128] Fixed monsters being able to move through immobile monsters on level transitions.

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

1 files changed, 9 insertions, 4 deletions

diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h
index fa896279c2..7f343b81f0 100644
--- a/crawl-ref/source/monplace.h
+++ b/crawl-ref/source/monplace.h
@@ -137,7 +137,8 @@ bool player_angers_monster(monsters *mon);
 /* ***********************************************************************
  * called from: misc - monplace - spells3
  * *********************************************************************** */
-bool empty_surrounds( int emx, int emy, unsigned char spc_wanted, int radius,
+bool empty_surrounds( int emx, int emy, dungeon_feature_type spc_wanted,
+                      int radius,
                       bool allow_centre, FixedVector<char, 2>& empty );
 
 
@@ -170,10 +171,14 @@ monster_type rand_dragon( dragon_class_type type );
 void mark_interesting_monst(struct monsters* monster,
                             beh_type behaviour = BEH_SLEEP);
 
-bool grid_compatible(int grid_wanted, int actual_grid, bool generation = false);
-bool monster_habitable_grid(int monster_class, int actual_grid, 
+bool grid_compatible(dungeon_feature_type grid_wanted,
+                     dungeon_feature_type actual_grid,
+                     bool generation = false);
+bool monster_habitable_grid(int monster_class,
+                            dungeon_feature_type actual_grid, 
                             int flies = -1, bool paralysed = false);
-bool monster_habitable_grid(const monsters *m, int actual_grid);
+bool monster_habitable_grid(const monsters *m,
+                            dungeon_feature_type actual_grid);
 bool monster_can_submerge(int monster_class, int grid);
 coord_def find_newmons_square(int mons_class, int x, int y);