diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-29 00:57:24 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-29 00:57:24 +0000 |
commit | da87d971f22b1c4c504910a7f57edf214bdb25f2 (patch) | |
tree | 4a1d02e3bb3fb395315b0f9386427656466602b3 /crawl-ref/source/religion.h | |
parent | 86bae0c1a3a28bc81c0fb66576e63c0a965c292c (diff) | |
download | crawl-ref-da87d971f22b1c4c504910a7f57edf214bdb25f2.tar.gz crawl-ref-da87d971f22b1c4c504910a7f57edf214bdb25f2.zip |
Consolidate and clean up some of the blessing code.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3928 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.h')
-rw-r--r-- | crawl-ref/source/religion.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 6c99a2ec3b..df053ac3f0 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -71,11 +71,12 @@ bool ely_destroy_weapons(); bool trog_burn_books(); bool tso_stab_safe_monster(const actor *act); -void bless_follower(god_type god, - bool (*suitable)(const monsters* mon), - monsters* follower = NULL); bool is_tso_follower(const monsters* mon); bool is_orcish_follower(const monsters* mon); +bool is_follower(const monsters* mon); +void bless_follower(monsters* follower = NULL, + god_type god = you.religion, + bool (*suitable)(const monsters* mon) = is_follower); bool god_hates_attacking_friend(god_type god, const actor *fr); |