summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-02 23:54:20 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-02 23:54:20 +0000
commit2d1079de4a7bca25573f3a4e737a9079a183a5b9 (patch)
treeefdb2d55abb3b7e85e9af537db7611d8a8ce07eb /crawl-ref/source/effects.cc
parentbe475192b63984f46893bcf60b3f79f3b8820570 (diff)
downloadcrawl-ref-2d1079de4a7bca25573f3a4e737a9079a183a5b9.tar.gz
crawl-ref-2d1079de4a7bca25573f3a4e737a9079a183a5b9.zip
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4816 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index cd3506bde2..3a97f65896 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -123,11 +123,8 @@ int holy_word_monsters(int x, int y, int pow, int caster)
monsters *monster = &menv[mon];
- if (invalid_monster(monster) || !mons_near(monster)
- || !mons_is_unholy(monster))
- {
+ if (invalid_monster(monster) || !mons_is_unholy(monster))
return retval;
- }
int hploss = roll_dice(2, 15) + (random2(pow) / 3);
@@ -251,11 +248,8 @@ int torment_monsters(int x, int y, int pow, int caster)
monsters *monster = &menv[mon];
- if (invalid_monster(monster) || !mons_near(monster)
- || mons_res_negative_energy(monster) == 3)
- {
+ if (invalid_monster(monster) || mons_res_negative_energy(monster) == 3)
return retval;
- }
int hploss = monster->hit_points / 2 - 1;