From 280d409759be7af8b54366f07ccba17348ea24f9 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sun, 13 Sep 2009 16:04:24 +0000 Subject: Commit several patches: * patch 2849505 by weyrava: make submerged monsters use the correct colour * patch 2857771 by caotto: another Feawn update * patch 2838771 by camedo: add potions of brilliance/agility * BR 2841651 by bookofjude: allow Merfolk to control-tele into deep water Now we need tiles for the new potions! git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10669 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/religion.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'crawl-ref/source/religion.h') diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 734c5840d8..f2e12e21ae 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -116,6 +116,10 @@ void beogh_convert_orc(monsters *orc, bool emergency, bool converted_by_follower = false); void jiyva_convert_slime(monsters* slime); void feawn_neutralise_plant(monsters *plant); +bool feawn_passthrough(const monsters * target); +bool feawn_protects(const monsters * target); +bool feawn_protects_species(int mc); +bool feawn_neutralises(const monsters * target); bool is_holy_item(const item_def& item); bool is_evil_item(const item_def& item); bool is_chaotic_item(const item_def& item); -- cgit v1.2.3-54-g00ecf