summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.h
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-12 09:32:55 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-12 09:32:55 +0000
commitaf82384c240a924e921b96d81b8dd295aa1f2a80 (patch)
tree247955562bf7669c24fce930959fe206942784ec /crawl-ref/source/religion.h
parent53dd513378a230964bd09f3de2a1bcfaeabc37be (diff)
downloadcrawl-ref-af82384c240a924e921b96d81b8dd295aa1f2a80.tar.gz
crawl-ref-af82384c240a924e921b96d81b8dd295aa1f2a80.zip
Fix bug #2089989: only place friendly god gifts after the player's turn is
over, so that any in-progress effects won't hurt them, thus turning them hostile and angering the player's god. Also try to avoid placing god gifts (friendly or hostile) in a damaging cloud, and if it's unavoidable and placing a friendly god gift there would anger the god then don't place them at all. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8426 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.h')
-rw-r--r--crawl-ref/source/religion.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h
index 16f56447f6..d9767c282f 100644
--- a/crawl-ref/source/religion.h
+++ b/crawl-ref/source/religion.h
@@ -153,9 +153,11 @@ bool bless_follower(monsters *follower = NULL,
bool force = false);
bool god_hates_attacking_friend(god_type god, const actor *fr);
+bool god_hates_attacking_friend(god_type god, int species);
bool god_likes_items(god_type god);
void religion_turn_start();
+void religion_turn_end();
int get_tension(god_type god = you.religion);
#endif