diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 19:27:45 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-16 19:27:45 +0000 |
commit | b3d8365da8efb695a18b85146a4e50ee0e9d7698 (patch) | |
tree | 5d26c889e5b71a6d14199170fcb7399573976cf3 /crawl-ref/source/mon-util.h | |
parent | f61a531950d1396bfd209007c5f53b399830ff39 (diff) | |
download | crawl-ref-b3d8365da8efb695a18b85146a4e50ee0e9d7698.tar.gz crawl-ref-b3d8365da8efb695a18b85146a4e50ee0e9d7698.zip |
Clean up and consolidate most of the monster pacification routines.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5885 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, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 8a56ef67c9..82b5a10f2a 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -586,6 +586,12 @@ void define_monster(monsters &mons); // last updated 4jan2001 (gdl) /* *********************************************************************** + * called from: delay - monstuff - spells1 + * *********************************************************************** */ +void mons_pacify(monsters *mon); + +// last updated 4jan2001 (gdl) +/* *********************************************************************** * called from: monstuff * *********************************************************************** */ bool mons_should_fire(struct bolt &beam); @@ -673,7 +679,7 @@ bool mons_is_stationary(const monsters *mon); bool mons_is_wall_shielded(int mc); bool mons_is_insubstantial(int mc); bool mons_has_blood(int mc); -bool mons_is_submerged(const monsters *mon); +bool mons_is_submerged(const monsters *m); bool invalid_monster(const monsters *mon); bool invalid_monster_class(int mclass); |