Cut some massive code duplication.

Every god conduct had a couple of functions, one for rods, one for
spellbooks, just to be able to tell between the two -- and neither was
needed.  A single function can deal with all of this; only Trog cares
if it's a book or a rod.

1 files changed, 6 insertions, 25 deletions

diff --git a/crawl-ref/source/goditem.h b/crawl-ref/source/goditem.h
index 5b8dff9751..bf4e6fecf4 100644
--- a/crawl-ref/source/goditem.h
+++ b/crawl-ref/source/goditem.h
@@ -14,33 +14,14 @@ bool is_corpse_violating_item(const item_def& item);
 bool is_evil_item(const item_def& item);
 bool is_unclean_item(const item_def& item);
 bool is_chaotic_item(const item_def& item);
-bool is_potentially_hasty_item(const item_def& item);
 bool is_hasty_item(const item_def& item);
 bool is_poisoned_item(const item_def& item);
-bool is_evil_discipline(int discipline);
-bool is_unholy_spell(spell_type spell, god_type god = GOD_NO_GOD);
-bool is_corpse_violating_spell(spell_type spell, god_type = GOD_NO_GOD);
-bool is_evil_spell(spell_type spell, god_type god = GOD_NO_GOD);
-bool is_unclean_spell(spell_type spell, god_type god = GOD_NO_GOD);
-bool is_chaotic_spell(spell_type spell, god_type god = GOD_NO_GOD);
-bool is_hasty_spell(spell_type spell, god_type god = GOD_NO_GOD);
-bool is_any_spell(spell_type spell, god_type god = GOD_NO_GOD);
-bool is_spellbook_type(const item_def& item, bool book_or_rod,
-                       bool (*suitable)(spell_type spell, god_type god) =
-                           is_any_spell,
-                       god_type god = you.religion);
-bool is_unholy_spellbook(const item_def& item);
-bool is_evil_spellbook(const item_def& item);
-bool is_unclean_spellbook(const item_def& item);
-bool is_chaotic_spellbook(const item_def& item);
-bool is_hasty_spellbook(const item_def& item);
-bool is_corpse_violating_spellbook(const item_def & item);
-bool is_unholy_rod(const item_def& item);
-bool is_evil_rod(const item_def& item);
-bool is_unclean_rod(const item_def& item);
-bool is_chaotic_rod(const item_def& item);
-bool is_hasty_rod(const item_def& item);
-bool is_corpse_violating_rod(const item_def & item);
+bool is_unholy_spell(spell_type spell);
+bool is_corpse_violating_spell(spell_type spell);
+bool is_evil_spell(spell_type spell);
+bool is_unclean_spell(spell_type spell);
+bool is_chaotic_spell(spell_type spell);
+bool is_hasty_spell(spell_type spell);
 conduct_type good_god_hates_item_handling(const item_def &item);
 conduct_type god_hates_item_handling(const item_def &item);