summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-util.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/spl-util.h')
-rw-r--r--crawl-ref/source/spl-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h
index ec0bbd105d..789ab34f41 100644
--- a/crawl-ref/source/spl-util.h
+++ b/crawl-ref/source/spl-util.h
@@ -94,6 +94,7 @@ unsigned int get_spell_flags( spell_type which_spell );
bool spell_typematch(spell_type which_spell, unsigned int which_discipline);
unsigned int get_spell_disciplines( spell_type which_spell );
+bool disciplines_conflict(unsigned int disc1, unsigned int disc2);
int count_bits( unsigned int bits );
const char *spell_title(spell_type which_spell);