summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-31 06:30:03 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-12-31 06:30:03 +0000
commit58bb44d35fd7b24c377895aabcb33ef5f201a978 (patch)
treeaa83719bf881750ed09da166a0090e3afb5563c2 /crawl-ref
parent889776439faa65aa5585de9d7bc6d691f0ae8fc1 (diff)
downloadcrawl-ref-58bb44d35fd7b24c377895aabcb33ef5f201a978.tar.gz
crawl-ref-58bb44d35fd7b24c377895aabcb33ef5f201a978.zip
Monster resistances and susceptibilities were being applied twice for beams,
fixed. This bug seems to have been around for a long time. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@748 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/beam.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 09ef67c36d..c24d4a8c2b 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3630,7 +3630,7 @@ static int affect_monster(struct bolt &beam, struct monsters *mon)
// note that hurt_final was calculated above, so we don't need it again.
// just need to apply flavoured specials (since we called with
// doFlavouredEffects = false above)
- hurt_final = mons_adjust_flavoured(mon, beam, hurt_final);
+ hurt_final = mons_adjust_flavoured(mon, beam, raw_damage);
// now hurt monster
hurt_monster( mon, hurt_final );