diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-07 06:27:02 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-07 06:27:02 +0000 |
| commit | 4f955d1dd5e8fda4fb45b09fbbfcab138e26a75b (patch) | |
| tree | 68ecdd47679725b34b009e250930f66991166c3d /crawl-ref/source/religion.h | |
| parent | 80219219bee1231f7833c47a394c8f5c3b04d283 (diff) | |
| download | crawl-ref-4f955d1dd5e8fda4fb45b09fbbfcab138e26a75b.tar.gz crawl-ref-4f955d1dd5e8fda4fb45b09fbbfcab138e26a75b.zip | |
Fix [2575361]: Properly differentiate between spells a god hates in
general and spells a god dislikes for the purpose of artefact
spellbooks, in order to avoid e.g. Elyvilon's hating a book of
conjurations.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8950 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.h')
| -rw-r--r-- | crawl-ref/source/religion.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index dbefc0aa0b..7a922030be 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -121,13 +121,14 @@ bool is_spellbook_type(const item_def& item, bool book_or_rod, bool is_holy_spellbook(const item_def& item); bool is_evil_spellbook(const item_def& item); bool is_chaotic_spellbook(const item_def& item); -bool god_dislikes_spellbook(const item_def& item); +bool god_hates_spellbook(const item_def& item); bool is_holy_rod(const item_def& item); bool is_evil_rod(const item_def& item); bool is_chaotic_rod(const item_def& item); -bool god_dislikes_rod(const item_def& item); -bool good_god_dislikes_item_handling(const item_def &item); -bool god_dislikes_item_handling(const item_def &item); +bool god_hates_rod(const item_def& item); +bool good_god_hates_item_handling(const item_def &item); +bool god_hates_item_handling(const item_def &item); +bool god_hates_spell_type(spell_type spell, god_type god = you.religion); // NOTE: As of now, these two functions only say if a god won't give a // spell/school when giving a gift. |