diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-24 11:14:10 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-24 11:14:10 +0000 |
| commit | 9b65dce7ed03eaa31d8cbd7d9b055de31ce514f6 (patch) | |
| tree | 9b03aa7f6adcbdd164cf8a934723d2a3b79f3120 /crawl-ref/source/mon-util.h | |
| parent | 6e693b7128114ccf331984c9769becd9f43d7a61 (diff) | |
| download | crawl-ref-9b65dce7ed03eaa31d8cbd7d9b055de31ce514f6.tar.gz crawl-ref-9b65dce7ed03eaa31d8cbd7d9b055de31ce514f6.zip | |
Fixed water elemental generation/movement bugs.
Cleaned up repeated code that controlled what monsters can move to what kinds of
squares.
Tweaked monster polymorph so monsters that can survive on the current monster's
location are valid targets without having to share the same habitat.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@101 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.h')
| -rw-r--r-- | crawl-ref/source/mon-util.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index e6f97da0e6..55695d203b 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -140,8 +140,8 @@ const char *ptr_monam( struct monsters *mon, char desc ); /* *********************************************************************** * called from: beam - direct - fight - monstuff - mstuff2 - spells4 - view * *********************************************************************** */ -char mons_class_flies( int mc ); -char mons_flies( struct monsters *mon ); +int mons_class_flies( int mc ); +int mons_flies( const monsters *mon ); // last updated XXmay2000 {dlb} @@ -430,6 +430,7 @@ bool check_mons_resist_magic( struct monsters *monster, int pow ); bool mons_is_stationary(const monsters *mons); bool invalid_monster(const monsters *mons); +bool invalid_monster_class(int mclass); bool monster_shover(const monsters *m); bool mons_is_paralysed(const monsters *m); @@ -437,4 +438,7 @@ bool mons_is_paralysed(const monsters *m); bool monster_senior(const monsters *first, const monsters *second); monster_type draco_subspecies( const monsters *mon ); +monster_type random_monster_at_grid(int x, int y); +monster_type random_monster_at_grid(int grid); + #endif |