From be475192b63984f46893bcf60b3f79f3b8820570 Mon Sep 17 00:00:00 2001 From: dolorous Date: Fri, 2 May 2008 23:35:45 +0000 Subject: Clean up and consolidate the holy word and torment effects. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4815 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/effects.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/effects.h') diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h index 627d7a5baa..aa6f4a2127 100644 --- a/crawl-ref/source/effects.h +++ b/crawl-ref/source/effects.h @@ -100,8 +100,10 @@ void yell(bool force = false); /* *********************************************************************** * called from: item_use - spell * *********************************************************************** */ +int holy_word(int pow, int caster, int x, int y, bool silent); + bool holy_word_player(int pow, int caster); -bool holy_word(int pow, int caster, bool silent = false); +int holy_word_monsters(int x, int y, int pow, int caster); // last updated 12may2000 {dlb} @@ -109,7 +111,7 @@ bool holy_word(int pow, int caster, bool silent = false); * called from: ability - decks - fight - it_use3 - item_use - mstuff2 - * spell * *********************************************************************** */ -void torment( int caster, int tx, int ty ); +int torment(int caster, int x, int y); bool torment_player(int pow, int caster); int torment_monsters(int x, int y, int pow, int caster); -- cgit v1.2.3-54-g00ecf