From dfc01209f51ec34a838e734906cccdd0cbfb0db5 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Tue, 27 Nov 2007 14:27:56 +0000 Subject: [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 --- crawl-ref/source/monplace.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/monplace.h') 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& 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); -- cgit v1.2.3-54-g00ecf