From 46a9a48fae192feb0ee6440bee0623a8c026163c Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Tue, 10 Nov 2009 21:07:22 -0600 Subject: Use wrapper functions properly when checking for holy spells. --- crawl-ref/source/goditem.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/goditem.cc') diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc index 3ea38375d9..24eb5f1e28 100644 --- a/crawl-ref/source/goditem.cc +++ b/crawl-ref/source/goditem.cc @@ -557,15 +557,15 @@ bool god_dislikes_spell_type(spell_type spell, god_type god) return (true); } + // Holy spells are probably too useful for Xom to find them + // interesting. + if (is_holy_spell(spell)) + return (true); + // Things are more fun for Xom the less the player knows in // advance. if (disciplines & SPTYP_DIVINATION) return (true); - - // Holy spells are probably too useful for Xom to find them - // interesting. - if (disciplines & SPTYP_HOLY) - return (true); break; case GOD_ELYVILON: @@ -601,7 +601,8 @@ bool god_dislikes_spell_discipline(int discipline, god_type god) return (is_holy_discipline(discipline)); case GOD_XOM: - return (discipline & (SPTYP_DIVINATION | SPTYP_HOLY)); + return (is_holy_discipline(discipline) + || discipline & (SPTYP_DIVINATION)); case GOD_ELYVILON: return (discipline & (SPTYP_CONJURATION | SPTYP_SUMMONING)); -- cgit v1.2.3-54-g00ecf