summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/item_use.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-09 11:09:54 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-06-09 11:09:54 +0000
commitc2f5651b0296286814cee6aef8de2fe828bebd45 (patch)
tree103976a5bfcbf76e8053bffa9860b8ba20bc6605 /crawl-ref/source/item_use.cc
parent50fdf21100b993b89e4f64b6c1e8cee2761bf2a0 (diff)
downloadcrawl-ref-c2f5651b0296286814cee6aef8de2fe828bebd45.tar.gz
crawl-ref-c2f5651b0296286814cee6aef8de2fe828bebd45.zip
Fixed off-by-one error in waypoint and exclude setting on the level-map (Erik).
Missile damage dice were being scaled before the full damage bonus was applied, fixed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1562 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
-rw-r--r--crawl-ref/source/item_use.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index f35db305b5..0d46b33945 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1953,8 +1953,6 @@ bool throw_it(struct bolt &pbolt, int throw_2, monsters *dummy_target)
pbolt.damage.size = dice_mult * pbolt.damage.size / 100;
pbolt.damage.size += slayDam;
- scale_dice( pbolt.damage );
-
// only add bonuses if we're throwing something sensible
if (thrown || launched || wepClass == OBJ_WEAPONS)
{
@@ -1962,6 +1960,8 @@ bool throw_it(struct bolt &pbolt, int throw_2, monsters *dummy_target)
pbolt.damage.size += ammoDamBonus + lnchDamBonus;
}
+ scale_dice( pbolt.damage );
+
#if DEBUG_DIAGNOSTICS
mprf( MSGCH_DIAGNOSTICS,
"H:%d+%d;a%dl%d. D:%d+%d;a%dl%d -> %d,%dd%d",