diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-07 21:37:34 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-07 21:37:34 +0000 |
commit | 100d0a3c9501882904c8d467bdd91bd43bec2d4f (patch) | |
tree | 803f3a4b714692635d7c52d5aa8be36df8d5c739 /crawl-ref/source/beam.cc | |
parent | f2bd755240e9711cfb0d8c8b69f1bad7185637a3 (diff) | |
download | crawl-ref-100d0a3c9501882904c8d467bdd91bd43bec2d4f.tar.gz crawl-ref-100d0a3c9501882904c8d467bdd91bd43bec2d4f.zip |
Add more minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7408 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 16219a9adc..34e0e4073d 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2373,10 +2373,10 @@ static void _beam_petrifies_monster(bolt &pbolt, monsters *monster) bool curare_hits_monster(const bolt &beam, monsters *monster, kill_category who, int levels) { - const bool res_poison = mons_res_poison(monster) > 0; - poison_monster(monster, who, levels, false); + const bool res_poison = mons_res_poison(monster) > 0; + if (!mons_res_asphyx(monster)) { int hurted = roll_dice(2, 6); @@ -2409,7 +2409,7 @@ bool poison_monster(monsters *monster, kill_category who, int levels, if (!monster->alive()) return (false); - if (levels <= 0 || (!force && mons_res_poison(monster) > 0)) + if ((!force && mons_res_poison(monster) > 0) || levels <= 0) return (false); const mon_enchant old_pois = monster->get_ench(ENCH_POISON); |