summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-23 22:34:20 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-10-23 22:34:20 +0000
commitbd4f01404182b9e41365d4c8b750b2002d996d7c (patch)
treeaa8f7bfb1649b8894e8be67679489c3dc275952a
parent17717c03ff836658253a133691f2277f308c7617 (diff)
downloadcrawl-ref-bd4f01404182b9e41365d4c8b750b2002d996d7c.tar.gz
crawl-ref-bd4f01404182b9e41365d4c8b750b2002d996d7c.zip
Fix portaled projectile duplicating returning weapons. (1817775)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2528 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/item_use.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index e9c7ec2291..382b22f549 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -1985,7 +1985,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// CALCULATIONS FOR THROWN WEAPONS
if (projected == LRET_THROWN)
{
- returning = (get_weapon_brand(item) == SPWPN_RETURNING &&
+ returning = (get_weapon_brand(item) == SPWPN_RETURNING && !teleport &&
!one_chance_in(1 + skill_bump(SK_THROWING)));
baseHit = 0;