diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-24 05:21:45 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-11-24 05:21:45 +0000 |
| commit | 62b57f5fce2459dade3705de7107d430c17d2e45 (patch) | |
| tree | 24743ccac6b43ae92a8dabe29ce0c8511b96f4d8 /crawl-ref/source/religion.h | |
| parent | 35a49060d5aa1154a1361c2d3504cd976835e942 (diff) | |
| download | crawl-ref-62b57f5fce2459dade3705de7107d430c17d2e45.tar.gz crawl-ref-62b57f5fce2459dade3705de7107d430c17d2e45.zip | |
Clean up and consolidate all the smiting routines into the new function
god_smites_you().
This fixes a problem where you could worship Beogh, draw the Wrath card
to make him smite you, and have him possibly protect you from his own
smiting. The smiting code in beogh_idol_revenge() wouldn't allow this,
but the smiting code in beogh_retribution() would.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2906 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.h')
| -rw-r--r-- | crawl-ref/source/religion.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index e7117ca90b..15b5d843cb 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -15,6 +15,7 @@ #define RELIGION_H #include "enum.h" +#include "ouch.h" #define MAX_PIETY 200 @@ -44,6 +45,8 @@ void offer_items(); bool god_likes_butchery(god_type god); bool god_hates_butchery(god_type god); bool god_protects_from_harm(god_type god); +void god_smites_you(god_type god, kill_method_type death_type, + const char *message = NULL); void divine_retribution(god_type god); bool beogh_water_walk(); |