diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-11 16:14:30 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-11 16:14:30 +0000 |
commit | 24e44f849415fe62589fce59d03d879f4a98aba3 (patch) | |
tree | 13abab2987303cf1e7f585e1263f015e96c7f838 /crawl-ref/source/monplace.h | |
parent | 7497ddf538959d8a70c4f18d5c3dc553548cbcff (diff) | |
download | crawl-ref-24e44f849415fe62589fce59d03d879f4a98aba3.tar.gz crawl-ref-24e44f849415fe62589fce59d03d879f4a98aba3.zip |
Merge trunk (1460:1463] to 0.2 branch (flying monsters, pools, and paralysis).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1464 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monplace.h')
-rw-r--r-- | crawl-ref/source/monplace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h index 5f00448a2b..7d351970b3 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/monplace.h @@ -94,7 +94,7 @@ void mark_interesting_monst(struct monsters* monster, bool grid_compatible(int grid_wanted, int actual_grid, bool generation = false); bool monster_habitable_grid(int monster_class, int actual_grid, - bool flies = false); + int flies = -1, bool paralysed = false); bool monster_habitable_grid(const monsters *m, int actual_grid); bool monster_floundering(const monsters *m); bool monster_can_submerge(int monster_class, int grid); |