From b3d8365da8efb695a18b85146a4e50ee0e9d7698 Mon Sep 17 00:00:00 2001 From: dolorous Date: Mon, 16 Jun 2008 19:27:45 +0000 Subject: 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 --- crawl-ref/source/mon-util.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/mon-util.h') 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 @@ -584,6 +584,12 @@ void mons_load_spells( monsters *mon, mon_spellbook_type book ); void define_monster(int mid); 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 @@ -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); -- cgit v1.2.3-54-g00ecf