diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-03-22 15:53:30 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-03-22 22:54:42 +0100 |
| commit | 889c096052179aa37a048ee9ed35153a6bbe30f1 (patch) | |
| tree | 9b6e9a9a4ba9eec31783d1fe4f35d6ca57102b5e /crawl-ref/source/mon-place.h | |
| parent | 3565ecf6be49a441389505484de12b63b42d3bc2 (diff) | |
| download | crawl-ref-889c096052179aa37a048ee9ed35153a6bbe30f1.tar.gz crawl-ref-889c096052179aa37a048ee9ed35153a6bbe30f1.zip | |
Use monster_type nearly everywhere.
Omitted:
* mspec.type (uses a lot of magic values in the negatives)
* item_def.orig_monnum (todo, +1 trick)
A few minor problems are fixed here:
* renamed gas spores passed mindex for monster_type
* demon summoning would break on addition/deletion of demon types
* vaults spawning zombified uniques would fail to mark them as used
Diffstat (limited to 'crawl-ref/source/mon-place.h')
| -rw-r--r-- | crawl-ref/source/mon-place.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-place.h b/crawl-ref/source/mon-place.h index 7b2dc2a135..c463a9d979 100644 --- a/crawl-ref/source/mon-place.h +++ b/crawl-ref/source/mon-place.h @@ -113,7 +113,7 @@ bool monster_habitable_grid( int flies = -1, bool paralysed = false); bool monster_can_submerge(const monster* mon, dungeon_feature_type grid); -coord_def find_newmons_square(int mons_class, const coord_def &p); +coord_def find_newmons_square(monster_type mons_class, const coord_def &p); coord_def find_newmons_square_contiguous(monster_type mons_class, const coord_def &start, int maxdistance = 3); @@ -127,8 +127,8 @@ void setup_vault_mon_list(); monster* get_free_monster(); -bool can_place_on_trap(int mon_type, trap_type trap); -bool mons_airborne(int mcls, int flies, bool paralysed); +bool can_place_on_trap(monster_type mon_type, trap_type trap); +bool mons_airborne(monster_type mcls, int flies, bool paralysed); void mons_add_blame(monster* mon, const std::string &blame_string); // Active monster band may influence gear generation on band followers. |