diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-11-23 04:20:37 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-11-23 04:20:37 +0100 |
| commit | a988659f3577f3001770fad52d2733b5d805450d (patch) | |
| tree | ba005f302cc377028aa94b747dcf93b1ffd1b9c7 /crawl-ref/source/effects.h | |
| parent | 9f03392bebacf6030e9d704909e5eb0157659592 (diff) | |
| parent | 441205f0d25fdc839b3e308df991b537e8e818b1 (diff) | |
| download | crawl-ref-a988659f3577f3001770fad52d2733b5d805450d.tar.gz crawl-ref-a988659f3577f3001770fad52d2733b5d805450d.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/effects.h')
| -rw-r--r-- | crawl-ref/source/effects.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h index 7d1f7197ca..2ea98d30d9 100644 --- a/crawl-ref/source/effects.h +++ b/crawl-ref/source/effects.h @@ -49,12 +49,12 @@ void direct_effect(monster* src, spell_type spl, bolt &pbolt, actor *defender); void yell(bool force = false); -int holy_word(int pow, int caster, const coord_def& where, bool silent = false, - actor *attacker = NULL); +void holy_word(int pow, int caster, const coord_def& where, bool silent = false, + actor *attacker = NULL); -int holy_word_player(int pow, int caster, actor *attacker = NULL); -int holy_word_monsters(coord_def where, int pow, int caster, - actor *attacker = NULL); +void holy_word_player(int pow, int caster, actor *attacker = NULL); +void holy_word_monsters(coord_def where, int pow, int caster, + actor *attacker = NULL); int torment(actor *attacker, int taux, const coord_def& where); int torment_player(actor *attacker, int taux); |